- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12616 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mikej Date: Sun Mar 15 20:37:18 2009 New Revision: 12616 Log: fix group_confirm regression from svn r12403 Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Mar 15 20:37:18 2009 @@ -178,7 +178,7 @@ goto wbreak; } - if (switch_channel_up(channel)) { + if (!switch_channel_up(channel)) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto wbreak; }

1 0

[commit] r12615 - in freeswitch/trunk/scripts/contrib/swk: flex/amf-test1/src php/amfphp
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: silik0n Date: Sun Mar 15 20:12:05 2009 New Revision: 12615 Log: Looks like we have most of the data retrival done... still needs some work on pushing data updates Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Sun Mar 15 20:12:05 2009 @@ -217,14 +217,14 @@ <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}" itemEditEnd="dgChangeDomainParam();" editable="true" id="dgDomainParam"> <mx:columns> - <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Parameter" dataField="name" width="120" editable="false" /> <mx:DataGridColumn headerText="Value" dataField="value"/> </mx:columns> </mx:DataGrid> <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}" itemEditEnd="dgChangeDomainVars();" editable="true" id="dgDomainVars"> <mx:columns> - <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Variable" dataField="name" width="120" editable="false"/> <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> @@ -265,14 +265,14 @@ <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.params}" change="dgChangeDomainUserParam();" editable="true" id="dgDomainUserParam"> <mx:columns> - <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Parameter" dataField="name" width="120" editable="false"/> <mx:DataGridColumn headerText="Value" dataField="value"/> </mx:columns> </mx:DataGrid> <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.variables}" change="dgChangeDomainVars();" editable="true" id="dgDomainUserVars"> <mx:columns> - <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Variable" dataField="name" width="120" editable="false"/> <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> @@ -294,27 +294,30 @@ <mx:Canvas label="Groups" width="100%" height="100%"> <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> - <mx:ComboBox top="10" horizontalCenter="0"></mx:ComboBox> - <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70"> + <mx:ComboBox top="10" horizontalCenter="0" id="groupsDomain" dataProvider="{freeswitch.getDirDomains.lastResult}" labelField="name"></mx:ComboBox> + <mx:DataGrid id="dgDirGroups" width="100%" horizontalCenter="0" top="40" bottom="70" dataProvider="{freeswitch.getDirGroups.lastResult}" + click="freeswitch.getDirGroup(dgDirGroups.selectedItem.uid)"> <mx:columns> - <mx:DataGridColumn headerText="Group" dataField="user_id"/> + <mx:DataGridColumn headerText="Group" dataField="name"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Groups" horizontalCenter="0" bottom="10"/> - <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40"/> + <mx:Button label="Refresh Groups" horizontalCenter="0" bottom="10" click="freeswitch.getDirGroups(groupsDomain.selectedItem.uid)"/> + <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40" click="freeswitch.getDirDomains()"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:DataGrid width="45%" left="10" top="0" bottom="70"> + <mx:DataGrid width="45%" left="10" top="0" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.members}" + dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> <mx:columns> - <mx:DataGridColumn headerText="Member" dataField="col1"/> + <mx:DataGridColumn headerText="Member" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> - <mx:DataGrid width="45%" right="10" top="0" bottom="70"> + <mx:DataGrid width="45%" right="10" top="0" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" + dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> <mx:columns> - <mx:DataGridColumn headerText="Available to Join" dataField="col1"/> + <mx:DataGridColumn headerText="Available to Join" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh" left="10" bottom="40"/> + <mx:Button label="Refresh" left="10" bottom="40" click="freeswitch.getDirGroup(dgDirGroups.selectedItem.uid)"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Sun Mar 15 20:12:05 2009 @@ -47,18 +47,17 @@ $db_username = 'root'; /* Database Server username */ $db_password = 'password'; /* Database Server password */ $db_database = 'shipment'; /* DataBase Name */ - - $dbh = new PDO("$dbtype:host=$db_hostname;dbname=$db_database", $db_username, $db_password, array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,)); - + if ($dbtype == 'mysql') { + $pdo_flags = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,); + } + $dbh = new PDO("$dbtype:host=$db_hostname;dbname=$db_database", $db_username, $db_password, $pdo_flags); return $dbh; } public function __construct() { - $esl_server = "127.0.0.1"; /* ESL Server */ $esl_port = "8021"; /* ESL Port */ $esl_secret = "ClueCon"; /* ESL Secret */ - $this->esl = new eslConnection($esl_server, $esl_port, $esl_secret); } @@ -67,14 +66,12 @@ public function getStatus() { $e = $this->esl->sendRecv("api status"); $body = $e->getBody(); - return $body; } public function getChannels() { $e = $this->esl->sendRecv("api show channels"); $body = $e->getBody(); - $temp = explode ("\n", $body); $total_count = sizeof($temp); $i = -1; @@ -100,7 +97,6 @@ public function getCalls() { $e = $this->esl->sendRecv("api show calls"); $body = $e->getBody(); - $temp = explode ("\n", $body); $total_count = sizeof($temp); $i = -1; @@ -129,7 +125,6 @@ $dialstring = "api originate $call_url $exten $dialplan $context $cid_name $cid_number $timeout"; $e = $this->esl->sendRecv($dialstring); $body = $e->getBody(); - return $body; } @@ -150,7 +145,6 @@ public function getConferenceList() { $e = $this->esl->sendRecv("api conference list"); $body = $e->getBody(); - $data=explode("\n", $body); $y=0; foreach($data as $row){ @@ -166,7 +160,6 @@ public function getConferenceUsers($conference_name) { $e = $this->esl->sendRecv("api conference $conference_name list"); $body = $e->getBody(); - $data=explode("\n", $body); $y=0; foreach($data as $row){ @@ -206,7 +199,6 @@ } else { $templist = glob("/usr/local/freeswitch/sounds/en/us/callie/*/*/*"); } - $x=0; foreach($templist as $file){ $temp_file = explode("/", $file); @@ -215,7 +207,6 @@ // $filelist[$x] = $file; $x++; } - return $filelist; } @@ -255,67 +246,27 @@ } /*** Directory Methods ***/ - + + /* Directory Domain Methods */ public function getDirDomains(){ $dbh = $this->getDbh(); - $query = sprintf("select * from domains"); $stmt = $dbh->query($query); $results = $stmt->fetchAll(); - return $results; } public function getDirDomain($domain_uid){ - $dbh = $this->getDbh(); - $query = sprintf("select * from domain_params where domains_uid = $domain_uid"); $stmt = $dbh->query($query); $results['params'] = $stmt->fetchAll(); - $query = sprintf("select * from domain_variables where domains_uid = $domain_uid"); $stmt = $dbh->query($query); $results['variables'] = $stmt->fetchAll(); - return $results; } - public function getDirUser($user_uid){ - - $dbh = $this->getDbh(); - - $query = sprintf("select * from user_params where users_uid = $user_uid"); - $stmt = $dbh->query($query); - $results['params'] = $stmt->fetchAll(); - - $query = sprintf("select * from user_variables where users_uid = $user_uid"); - $stmt = $dbh->query($query); - $results['variables'] = $stmt->fetchAll(); - - return $results; - } - - public function getDirUsers($domain_uid){ - $dbh = $this->getDbh(); - - $query = sprintf("select * from users where domain_uid = $domain_uid"); - $stmt = $dbh->query($query); - $results = $stmt->fetchAll(); - - return $results; - } - - public function getDirGroups($domain_uid){ - $dbh = $this->getDbh(); - - $query = sprintf("select * from groups where domain_uid = $domain_uid"); - $stmt = $dbh->query($query); - $results = $stmt->fetchAll(); - - return $results; - } - public function addDirDomain($domain_name){ $dbh = $this->getDbh(); $query = sprintf('insert into domains (name) values ("%s")', $domain_name); @@ -346,6 +297,47 @@ return $dbh->exec($query); } + + /* Directory User Methods */ + public function getDirUser($user_uid){ + $dbh = $this->getDbh(); + $query = sprintf("select * from user_params where users_uid = $user_uid"); + $stmt = $dbh->query($query); + $results['params'] = $stmt->fetchAll(); + $query = sprintf("select * from user_variables where users_uid = $user_uid"); + $stmt = $dbh->query($query); + $results['variables'] = $stmt->fetchAll(); + return $results; + } + + public function getDirUsers($domain_uid){ + $dbh = $this->getDbh(); + $query = sprintf("select * from users where domain_uid = $domain_uid"); + $stmt = $dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + + /* Directory Group Methods */ + public function getDirGroups($domain_uid){ + $dbh = $this->getDbh(); + $query = sprintf("select * from groups where domains_uid = $domain_uid"); + $stmt = $dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + + public function getDirGroup($groups_uid){ + $dbh = $this->getDbh(); + $query = sprintf("select a.uid as groupMemberUid, a.users_uid as usersUid, b.username as usersUsername from group_members as a, users as b where a.groups_uid = $groups_uid and a.users_uid = b.uid") ; + $stmt = $dbh->query($query); + $results['members'] = $stmt->fetchAll(); + $query = sprintf("select uid as usersUid, username as usersUsername from users where uid not in (select users_uid from group_members where groups_uid = $groups_uid) and domain_uid = (select domains_uid from groups where uid = $groups_uid)"); + $stmt = $dbh->query($query); + $results['nonmembers'] = $stmt->fetchAll(); + return $results; + } + } /* For Emacs: * Local Variables:

1 0

[commit] r12614 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: anthm Date: Sun Mar 15 19:28:18 2009 New Revision: 12614 Log: fix regression Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sun Mar 15 19:28:18 2009 @@ -307,13 +307,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(chan_a)); goto end_of_bridge_loop; } - ans_a++; + ans_a = 1; } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { if (switch_channel_pre_answer(chan_a) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(chan_a)); goto end_of_bridge_loop; } - pre_b++; + pre_b = 1; } if (!pre_b) { switch_yield(10000); @@ -321,7 +321,7 @@ } } - if (!ans_a && !ans_b) { + if (ans_a != ans_b) { switch_channel_t *un = ans_a ? chan_b : chan_a; if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { @@ -329,7 +329,7 @@ goto end_of_bridge_loop; } - if (ans_a) ans_b++; else ans_a++; + if (ans_a) ans_b = 1; else ans_a = 1; }

1 0

[commit] r12613 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 12:47:57 2009 New Revision: 12613 Log: tweak Modified: freeswitch/trunk/libs/esl/python/events.py freeswitch/trunk/libs/esl/python/single_command.py Modified: freeswitch/trunk/libs/esl/python/events.py ============================================================================== --- freeswitch/trunk/libs/esl/python/events.py (original) +++ freeswitch/trunk/libs/esl/python/events.py Sun Mar 15 12:47:57 2009 @@ -5,7 +5,7 @@ from ESL import * -con = ESLconnection("localhost","8021","rad1ance") +con = ESLconnection("localhost","8021","ClueCon") #are we connected? if con.connected: Modified: freeswitch/trunk/libs/esl/python/single_command.py ============================================================================== --- freeswitch/trunk/libs/esl/python/single_command.py (original) +++ freeswitch/trunk/libs/esl/python/single_command.py Sun Mar 15 12:47:57 2009 @@ -4,7 +4,7 @@ import sys from ESL import * -con = ESLconnection("localhost","8021","rad1ance") +con = ESLconnection("localhost","8021","ClueCon") #are we connected? if con.connected:

1 0

[commit] r12612 - in freeswitch/trunk: libs/esl/python libs/libdingaling/src src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: anthm Date: Sun Mar 15 11:56:15 2009 New Revision: 12612 Log: LIBDING-13 Modified: freeswitch/trunk/libs/esl/python/events.py freeswitch/trunk/libs/esl/python/single_command.py freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/libs/esl/python/events.py ============================================================================== --- freeswitch/trunk/libs/esl/python/events.py (original) +++ freeswitch/trunk/libs/esl/python/events.py Sun Mar 15 11:56:15 2009 @@ -5,7 +5,7 @@ from ESL import * -con = ESLconnection("localhost","8021","ClueCon") +con = ESLconnection("localhost","8021","rad1ance") #are we connected? if con.connected: Modified: freeswitch/trunk/libs/esl/python/single_command.py ============================================================================== --- freeswitch/trunk/libs/esl/python/single_command.py (original) +++ freeswitch/trunk/libs/esl/python/single_command.py Sun Mar 15 11:56:15 2009 @@ -4,7 +4,7 @@ import sys from ESL import * -con = ESLconnection("localhost","8021","ClueCon") +con = ESLconnection("localhost","8021","rad1ance") #are we connected? if con.connected: Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sun Mar 15 11:56:15 2009 @@ -1432,7 +1432,7 @@ ldl_set_flag_locked(handle, LDL_FLAG_QUEUE_RUNNING); - while (ldl_test_flag(handle, LDL_FLAG_RUNNING)) { + while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { ldl_flush_queue(handle, 0); if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS) { @@ -1467,7 +1467,7 @@ static void xmpp_connect(ldl_handle_t *handle, char *jabber_id, char *pass) { - while (ldl_test_flag(handle, LDL_FLAG_RUNNING)) { + while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { int e; char tmp[512], *sl; @@ -1522,7 +1522,7 @@ launch_queue_thread(handle); } - while (ldl_test_flag(handle, LDL_FLAG_RUNNING)) { + while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { e = iks_recv(handle->parser, 1); if (!ldl_test_flag(handle, LDL_FLAG_TLS) && handle->loop_callback) { if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS) { @@ -2166,6 +2166,12 @@ } } +ldl_status ldl_global_terminate(void) +{ + ldl_clear_flag_locked((&globals), LDL_FLAG_READY); + return LDL_STATUS_SUCCESS; +} + ldl_status ldl_global_init(int debug) { if (ldl_test_flag((&globals), LDL_FLAG_INIT)) { @@ -2191,6 +2197,7 @@ globals.logger = default_logger; globals.avatar_hash = apr_hash_make(globals.memory_pool); ldl_set_flag_locked((&globals), LDL_FLAG_INIT); + ldl_set_flag_locked((&globals), LDL_FLAG_READY); return LDL_STATUS_SUCCESS; } Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Sun Mar 15 11:56:15 2009 @@ -603,6 +603,9 @@ \param log_stream the new log stream */ void ldl_handle_set_log_stream(ldl_handle_t *handle, FILE *log_stream); + +ldl_status ldl_global_terminate(void); + ///\} Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Mar 15 11:56:15 2009 @@ -1868,10 +1868,11 @@ if (globals.running) { int x = 0; globals.running = 0; + ldl_global_terminate(); while (globals.handles > 0) { switch_yield(100000); x++; - if (x > 10) { + if (x > 100) { break; } }

1 0

[commit] r12611 - freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 05:16:40 2009 New Revision: 12611 Log: Add forms for creating new users and domains no backend scripts for these yet Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newDomainForm.mxml freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Sun Mar 15 05:16:40 2009 @@ -62,6 +62,16 @@ PopUpManager.createPopUp(this, statusForm, false); } + public function doNewUserForm():void { + var origWindow:IFlexDisplayObject = + PopUpManager.createPopUp(this, newUserForm, false); + } + + public function doNewDomainForm():void { + var origWindow:IFlexDisplayObject = + PopUpManager.createPopUp(this, newDomainForm, false); + } + public function addDomainParam():void { freeswitch.addDirDomainParam(gridDomainsDomain.selectedItem.uid, inputDomainParamName.text, inputDomainParamValue.text); freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); @@ -221,7 +231,7 @@ <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="-52"/> <mx:Button label="Add Parameter" left="149" bottom="40" click="addDomainParam()"/> <mx:Button label="Add Variable" bottom="40" right="168" width="99" click="addDomainVar()"/> - <mx:Button label="Add Domain" bottom="10" horizontalCenter="63"/> + <mx:Button label="Add Domain" bottom="10" horizontalCenter="63" click="doNewDomainForm();"/> <mx:Label text="Parameter" bottom="90" left="10"/> <mx:TextInput width="121" id="inputDomainParamName" bottom="70" left="10"/> <mx:TextInput width="272" id="inputDomainParamValue" bottom="70" left="139"/> @@ -266,10 +276,10 @@ <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="-52"/> + <mx:Button label="Refresh User" bottom="10" horizontalCenter="-52"/> <mx:Button label="Add Parameter" left="149" bottom="40" click="addDomainUserParam()"/> <mx:Button label="Add Variable" bottom="40" right="168" width="99" click="addDomainUserVar()"/> - <mx:Button label="Add Domain" bottom="10" horizontalCenter="63"/> + <mx:Button label="Add User" bottom="10" horizontalCenter="63" click="doNewUserForm();"/> <mx:Label text="Parameter" bottom="90" left="10"/> <mx:TextInput width="121" id="inputDomainUserParamName" bottom="70" left="10"/> <mx:TextInput width="272" id="inputDomainUserParamValue" bottom="70" left="139"/> Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newDomainForm.mxml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newDomainForm.mxml Sun Mar 15 05:16:40 2009 @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="306" title="Add Domain"> + <mx:Script> + <![CDATA[ + import mx.managers.PopUpManager; + import mx.controls.Alert; + import mx.rpc.events.ResultEvent; + + private function doInit():void { + PopUpManager.centerPopUp(this); + } + + private function doCall():void { + parentApplication.freeswitch.addDirDomain(domainName.text, dialString.text, defaultGateway.text, defaultAreacode.text, xferFallbackExten.text, recordStereo.selected); + PopUpManager.removePopUp(this); + } + ]]> + </mx:Script> + + <mx:Form width="100%"> + <mx:FormItem label="Domain Name" width="100%"> + <mx:TextInput id="domainName" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Dial String" width="100%"> + <mx:TextInput id="dialString" width="100%"/> + </mx:FormItem> + <mx:FormItem label="default_gateway" width="100%"> + <mx:TextInput id="defaultGateway" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Default Areacode" width="100%"> + <mx:TextInput id="defaultAreacode" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Xfer Fallback Exten" width="100%"> + <mx:TextInput id="xferFallbackExten" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Record Stereo"> + <mx:CheckBox id="recordStereo" /> + </mx:FormItem> + + </mx:Form> + <mx:HBox horizontalAlign="center" width="314"> + <mx:Button click="doCall();" label="Add Domain"/> + <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> + </mx:HBox> +</mx:TitleWindow> \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/newUserForm.mxml Sun Mar 15 05:16:40 2009 @@ -0,0 +1,47 @@ +<?xml version="1.0"?> +<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" creationComplete="doInit();" height="306" title="Add User"> + <mx:Script> + <![CDATA[ + import mx.managers.PopUpManager; + import mx.controls.Alert; + import mx.rpc.events.ResultEvent; + + private function doInit():void { + PopUpManager.centerPopUp(this); + } + + private function doCall():void { + parentApplication.freeswitch.addDirDomainUser(username.text, mailbox.text, cidr.text, password.text, vm_password.text, cid_name.text, cid_number.text); + PopUpManager.removePopUp(this); + } + ]]> + </mx:Script> + + <mx:Form width="100%"> + <mx:FormItem label="UserName" width="100%"> + <mx:TextInput id="username" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Mailbox" width="100%"> + <mx:TextInput id="mailbox" width="100%"/> + </mx:FormItem> + <mx:FormItem label="CIDR" width="100%"> + <mx:TextInput id="cidr" width="100%"/> + </mx:FormItem> + <mx:FormItem label="Password" width="100%"> + <mx:TextInput id="password" width="100%"/> + </mx:FormItem> + <mx:FormItem label="VM PIN" width="100%"> + <mx:TextInput id="vm_password" width="100%"/> + </mx:FormItem> + <mx:FormItem label="CallerID Name" width="100%"> + <mx:TextInput id="cid_name" width="100%"/> + </mx:FormItem> + <mx:FormItem label="CallerID Number" width="100%"> + <mx:TextInput id="cid_number" width="100%"/> + </mx:FormItem> + </mx:Form> + <mx:HBox horizontalAlign="center" width="314"> + <mx:Button click="doCall();" label="Add User"/> + <mx:Button click="PopUpManager.removePopUp(this);" label="Cancel"/> + </mx:HBox> +</mx:TitleWindow> \ No newline at end of file

1 0

[commit] r12610 - freeswitch/trunk/scripts/contrib/swk/sql
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 04:38:27 2009 New Revision: 12610 Log: update SQL schema getting ready to add menus, and add some sample data Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql (original) +++ freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Sun Mar 15 04:38:27 2009 @@ -1,112 +1,97 @@ --- --- Initial Table with Sample Data for Project Shipment --- (Or atleast I'm calling it Shipment until I get a better name --- - -SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; - --- --- Database: `shipment` +-- MySQL dump 10.11 -- - --- -------------------------------------------------------- - --- --- Table structure for table `domains` --- - -CREATE TABLE IF NOT EXISTS `domains` ( - `uid` int(11) NOT NULL auto_increment COMMENT 'UID for the table Auto Assigned', - `name` varchar(128) NOT NULL COMMENT 'domaine name', - `enabled` tinyint(1) NOT NULL default '1', - PRIMARY KEY (`uid`), - UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; - --- --- Dumping data for table `domains` --- - -INSERT INTO `domains` (`uid`, `name`, `enabled`) VALUES -(1, '192.168.1.140', 1); - --- -------------------------------------------------------- +-- Host: localhost Database: shipment +-- ------------------------------------------------------ +-- Server version 5.0.45 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -- -- Table structure for table `domain_params` -- -CREATE TABLE IF NOT EXISTS `domain_params` ( +DROP TABLE IF EXISTS `domain_params`; +CREATE TABLE `domain_params` ( `uid` int(11) NOT NULL auto_increment, `domains_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(256) NOT NULL, PRIMARY KEY (`uid`), KEY `domain_uid` (`domains_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -- -- Dumping data for table `domain_params` -- -INSERT INTO `domain_params` (`uid`, `domains_uid`, `name`, `value`) VALUES -(1, 1, 'dial-string', '{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}'); - --- -------------------------------------------------------- +LOCK TABLES `domain_params` WRITE; +/*!40000 ALTER TABLE `domain_params` DISABLE KEYS */; +INSERT INTO `domain_params` VALUES (1,1,'dial-string','{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}'); +/*!40000 ALTER TABLE `domain_params` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `domain_variables` -- -CREATE TABLE IF NOT EXISTS `domain_variables` ( +DROP TABLE IF EXISTS `domain_variables`; +CREATE TABLE `domain_variables` ( `uid` int(11) NOT NULL auto_increment, `domains_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`uid`), KEY `domain_uid` (`domains_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=5 ; +) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1; -- -- Dumping data for table `domain_variables` -- -INSERT INTO `domain_variables` (`uid`, `domains_uid`, `name`, `value`) VALUES -(1, 1, 'record_stereo', 'true'), -(2, 1, 'default_gateway', '$${default_provider}'), -(3, 1, 'default_areacode', '$${default_areacode}'), -(4, 1, 'transfer_fallback_extension', 'operator'); - --- -------------------------------------------------------- +LOCK TABLES `domain_variables` WRITE; +/*!40000 ALTER TABLE `domain_variables` DISABLE KEYS */; +INSERT INTO `domain_variables` VALUES (1,1,'record_stereo','true'),(2,1,'default_gateway','$${default_provider}'),(3,1,'default_areacode','$${default_areacode}'),(4,1,'transfer_fallback_extension','operator'); +/*!40000 ALTER TABLE `domain_variables` ENABLE KEYS */; +UNLOCK TABLES; -- --- Table structure for table `groups` +-- Table structure for table `domains` -- -CREATE TABLE IF NOT EXISTS `groups` ( - `uid` int(11) NOT NULL auto_increment, - `domains_uid` int(11) NOT NULL, - `name` varchar(64) NOT NULL, +DROP TABLE IF EXISTS `domains`; +CREATE TABLE `domains` ( + `uid` int(11) NOT NULL auto_increment COMMENT 'UID for the table Auto Assigned', + `name` varchar(128) NOT NULL COMMENT 'domaine name', + `enabled` tinyint(1) NOT NULL default '1', PRIMARY KEY (`uid`), - KEY `domain_uid` (`domains_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ; + UNIQUE KEY `name` (`name`) +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1; -- --- Dumping data for table `groups` +-- Dumping data for table `domains` -- -INSERT INTO `groups` (`uid`, `domains_uid`, `name`) VALUES -(1, 1, 'sales'), -(2, 1, 'billing'), -(3, 1, 'support'); - --- -------------------------------------------------------- +LOCK TABLES `domains` WRITE; +/*!40000 ALTER TABLE `domains` DISABLE KEYS */; +INSERT INTO `domains` VALUES (1,'192.168.1.140',1); +/*!40000 ALTER TABLE `domains` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `group_members` -- -CREATE TABLE IF NOT EXISTS `group_members` ( +DROP TABLE IF EXISTS `group_members`; +CREATE TABLE `group_members` ( `uid` int(11) NOT NULL auto_increment, `domains_uid` int(11) NOT NULL, `groups_uid` int(11) NOT NULL, @@ -114,132 +99,176 @@ `type` varchar(32) NOT NULL, PRIMARY KEY (`uid`), KEY `domain_uid` (`domains_uid`,`groups_uid`,`users_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=13 DEFAULT CHARSET=latin1; -- -- Dumping data for table `group_members` -- - --- -------------------------------------------------------- +LOCK TABLES `group_members` WRITE; +/*!40000 ALTER TABLE `group_members` DISABLE KEYS */; +INSERT INTO `group_members` VALUES (1,1,1,1,'pointer'),(2,1,1,2,'pointer'),(3,1,1,3,'pointer'),(4,1,1,4,'pointer'),(5,1,2,5,'pointer'),(6,1,2,6,'pointer'),(7,1,2,7,'pointer'),(8,1,2,8,'pointer'),(9,1,3,9,'pointer'),(10,1,3,10,'pointer'),(11,1,3,11,'pointer'),(12,1,3,12,'pointer'); +/*!40000 ALTER TABLE `group_members` ENABLE KEYS */; +UNLOCK TABLES; -- --- Table structure for table `users` +-- Table structure for table `groups` -- -CREATE TABLE IF NOT EXISTS `users` ( +DROP TABLE IF EXISTS `groups`; +CREATE TABLE `groups` ( `uid` int(11) NOT NULL auto_increment, - `domain_uid` int(11) NOT NULL, - `username` varchar(64) NOT NULL, - `mailbox` varchar(64) default NULL, - `cidr` varchar(32) default NULL, - `enabled` tinyint(1) NOT NULL default '1', + `domains_uid` int(11) NOT NULL, + `name` varchar(64) NOT NULL, PRIMARY KEY (`uid`), - KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=21 ; + KEY `domain_uid` (`domains_uid`) +) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1; -- --- Dumping data for table `users` +-- Dumping data for table `groups` -- -INSERT INTO `users` (`uid`, `domain_uid`, `username`, `mailbox`, `cidr`, `enabled`) VALUES -(1, 1, '1000', '1000', NULL, 1), -(2, 1, '1001', '1001', NULL, 1), -(3, 1, '1002', '1002', NULL, 1), -(4, 1, '1003', '1003', NULL, 1), -(5, 1, '1004', '1004', NULL, 1), -(6, 1, '1005', '1005', NULL, 1), -(7, 1, '1006', '1006', NULL, 1), -(8, 1, '1007', '1007', NULL, 1), -(9, 1, '1008', '1008', NULL, 1), -(10, 1, '1009', '1009', NULL, 1), -(11, 1, '1000', '1000', NULL, 1), -(12, 1, '1011', '1011', NULL, 1), -(13, 1, '1012', '1012', NULL, 1), -(14, 1, '1013', '1013', NULL, 1), -(15, 1, '1014', '1014', NULL, 1), -(16, 1, '1015', '1015', NULL, 1), -(17, 1, '1016', '1016', NULL, 1), -(18, 1, '1017', '1017', NULL, 1), -(19, 1, '1018', '1018', NULL, 1), -(20, 1, '1019', '1019', NULL, 1); +LOCK TABLES `groups` WRITE; +/*!40000 ALTER TABLE `groups` DISABLE KEYS */; +INSERT INTO `groups` VALUES (1,1,'sales'),(2,1,'billing'),(3,1,'support'); +/*!40000 ALTER TABLE `groups` ENABLE KEYS */; +UNLOCK TABLES; --- -------------------------------------------------------- +-- +-- Table structure for table `menu_entries` +-- + +DROP TABLE IF EXISTS `menu_entries`; +CREATE TABLE `menu_entries` ( + `uid` int(11) NOT NULL auto_increment, + `menu_uid` int(11) NOT NULL, + `action` varchar(32) NOT NULL, + `digits` varchar(16) NOT NULL, + `param` varchar(256) default NULL, + PRIMARY KEY (`uid`) +) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `menu_entries` +-- + +LOCK TABLES `menu_entries` WRITE; +/*!40000 ALTER TABLE `menu_entries` DISABLE KEYS */; +INSERT INTO `menu_entries` VALUES (1,1,'menu-exec-app','1','bridge sofia/$${domain}/888(a)conference.freeswitch.org'),(2,1,'menu-exec-app','2','transfer 9996 XML default'),(3,1,'menu-exec-app','3','transfer 9999 XML default'),(4,1,'menu-sub','4','demo_ivr_submenu'),(5,1,'menu-exec-app','5','transfer 1234*256 enum'),(6,1,'menu-exec-app','/^(10[01][0-9])$','transfer $1 XML features'),(7,1,'menu-top','9',NULL),(8,2,'menu-top','*',NULL); +/*!40000 ALTER TABLE `menu_entries` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `menus` +-- + +DROP TABLE IF EXISTS `menus`; +CREATE TABLE `menus` ( + `uid` int(11) NOT NULL auto_increment, + `name` varchar(64) NOT NULL, + `greet_long` varchar(256) default NULL, + `greet_short` varchar(256) default NULL, + `invalid_sound` varchar(256) default NULL, + `exit_sound` varchar(256) default NULL, + `timeout` int(11) default NULL, + `inter_digit_timeout` int(11) default NULL, + `max_failures` int(11) default NULL, + `max_timeouts` int(11) default NULL, + `digit_len` int(11) default NULL, + PRIMARY KEY (`uid`) +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `menus` +-- + +LOCK TABLES `menus` WRITE; +/*!40000 ALTER TABLE `menus` DISABLE KEYS */; +INSERT INTO `menus` VALUES (1,'demo_ivr','phrase:demo_ivr_main_menu','phrase:demo_ivr_main_menu_short','ivr/ivr-that_was_an_invalid_entry.wav','voicemail/vm-goodbye.wav',10000,2000,3,3,4),(2,'demo_ivr_submenu','phrase:demo_ivr_sub_menu','phrase:demo_ivr_sub_menu_short','ivr/ivr-that_was_an_invalid_entry.wav','voicemail/vm-goodbye.wav',15000,NULL,3,3,NULL); +/*!40000 ALTER TABLE `menus` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `user_params` -- -CREATE TABLE IF NOT EXISTS `user_params` ( +DROP TABLE IF EXISTS `user_params`; +CREATE TABLE `user_params` ( `uid` int(11) NOT NULL auto_increment, `users_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`uid`), KEY `user_uid` (`users_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=39 ; +) ENGINE=MyISAM AUTO_INCREMENT=39 DEFAULT CHARSET=latin1; -- -- Dumping data for table `user_params` -- -INSERT INTO `user_params` (`uid`, `users_uid`, `name`, `value`) VALUES -(1, 1, 'password', '1234'), -(2, 1, 'vm-password', '1000'), -(3, 2, 'password', '1234'), -(4, 2, 'vm-password', '1002'), -(5, 3, 'password', '1234'), -(6, 3, 'vm-password', '1003'), -(7, 4, 'password', '1234'), -(8, 4, 'vm-password', '1004'), -(9, 5, 'password', '1234'), -(10, 5, 'vm-password', '1005'), -(11, 6, 'password', '1234'), -(12, 6, 'vm-password', '1006'), -(13, 7, 'password', '1234'), -(14, 7, 'vm-password', '1007'), -(15, 8, 'password', '1234'), -(16, 8, 'vm-password', '1008'), -(17, 9, 'password', '1234'), -(18, 9, 'vm-password', '1009'), -(19, 10, 'password', '1234'), -(20, 10, 'vm-password', '1010'), -(21, 11, 'password', '1234'), -(22, 11, 'vm-password', '1011'), -(23, 12, 'password', '1234'), -(24, 12, 'vm-password', '1012'), -(25, 13, 'password', '1234'), -(26, 13, 'vm-password', '1013'), -(27, 14, 'password', '1234'), -(28, 14, 'vm-password', '1014'), -(29, 15, 'password', '1234'), -(30, 15, 'vm-password', '1015'), -(31, 16, 'password', '1234'), -(32, 16, 'vm-password', '1016'), -(33, 17, 'password', '1234'), -(34, 17, 'vm-password', '1017'), -(35, 18, 'password', '1234'), -(36, 18, 'vm-password', '1018'), -(37, 19, 'password', '1234'), -(38, 19, 'vm-password', '1019'); - --- -------------------------------------------------------- +LOCK TABLES `user_params` WRITE; +/*!40000 ALTER TABLE `user_params` DISABLE KEYS */; +INSERT INTO `user_params` VALUES (1,1,'password','1234'),(2,1,'vm-password','1000'),(3,2,'password','1234'),(4,2,'vm-password','1002'),(5,3,'password','1234'),(6,3,'vm-password','1003'),(7,4,'password','1234'),(8,4,'vm-password','1004'),(9,5,'password','1234'),(10,5,'vm-password','1005'),(11,6,'password','1234'),(12,6,'vm-password','1006'),(13,7,'password','1234'),(14,7,'vm-password','1007'),(15,8,'password','1234'),(16,8,'vm-password','1008'),(17,9,'password','1234'),(18,9,'vm-password','1009'),(19,10,'password','1234'),(20,10,'vm-password','1010'),(21,11,'password','1234'),(22,11,'vm-password','1011'),(23,12,'password','1234'),(24,12,'vm-password','1012'),(25,13,'password','1234'),(26,13,'vm-password','1013'),(27,14,'password','1234'),(28,14,'vm-password','1014'),(29,15,'password','1234'),(30,15,'vm-password','1015'),(31,16,'password','1234'),(32,16,'vm-password','1016'),(33,17,'password','1234'),(34,17,'vm-password','1017'),(35,18,'password','1234'),(36,18,'vm-password','1018'),(37,19,'password','1234'),(38,19,'vm-password','1019'); +/*!40000 ALTER TABLE `user_params` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `user_variables` -- -CREATE TABLE IF NOT EXISTS `user_variables` ( +DROP TABLE IF EXISTS `user_variables`; +CREATE TABLE `user_variables` ( `uid` int(11) NOT NULL auto_increment, `users_uid` int(11) NOT NULL, `name` varchar(64) NOT NULL, `value` varchar(128) NOT NULL, PRIMARY KEY (`uid`), KEY `user_uid` (`users_uid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1; -- -- Dumping data for table `user_variables` -- +LOCK TABLES `user_variables` WRITE; +/*!40000 ALTER TABLE `user_variables` DISABLE KEYS */; +INSERT INTO `user_variables` VALUES (1,1,'toll_allow','domestic,international,local'),(2,1,'accountcode','1000'),(3,1,'user_context','default'),(4,1,'effective_caller_id_name','Extension 1000'),(5,1,'effective_caller_id_number','1000'),(6,1,'outbound_caller_id_name','$${outbound_caller_name}'),(7,1,'outbound_caller_id_number','$${outbound_caller_id}'),(8,1,'callgroup','techsupport'); +/*!40000 ALTER TABLE `user_variables` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `users` +-- + +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `uid` int(11) NOT NULL auto_increment, + `domain_uid` int(11) NOT NULL, + `username` varchar(64) NOT NULL, + `mailbox` varchar(64) default NULL, + `cidr` varchar(32) default NULL, + `enabled` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`uid`), + KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) +) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `users` +-- + +LOCK TABLES `users` WRITE; +/*!40000 ALTER TABLE `users` DISABLE KEYS */; +INSERT INTO `users` VALUES (1,1,'1000','1000',NULL,1),(2,1,'1001','1001',NULL,1),(3,1,'1002','1002',NULL,1),(4,1,'1003','1003',NULL,1),(5,1,'1004','1004',NULL,1),(6,1,'1005','1005',NULL,1),(7,1,'1006','1006',NULL,1),(8,1,'1007','1007',NULL,1),(9,1,'1008','1008',NULL,1),(10,1,'1009','1009',NULL,1),(11,1,'1010','1010',NULL,1),(12,1,'1011','1011',NULL,1),(13,1,'1012','1012',NULL,1),(14,1,'1013','1013',NULL,1),(15,1,'1014','1014',NULL,1),(16,1,'1015','1015',NULL,1),(17,1,'1016','1016',NULL,1),(18,1,'1017','1017',NULL,1),(19,1,'1018','1018',NULL,1),(20,1,'1019','1019',NULL,1); +/*!40000 ALTER TABLE `users` ENABLE KEYS */; +UNLOCK TABLES; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +-- Dump completed on 2009-03-15 9:30:01

1 0

[commit] r12609 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 04:37:47 2009 New Revision: 12609 Log: format fixing Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Sun Mar 15 04:37:47 2009 @@ -49,10 +49,7 @@ max-failures="3"> <entry action="menu-exit" digits="*"/> <entry action="menu-playback" digits="1" param="say:You pressed 1"/> - <entry action="menu-call-transfer" digits="2" param= - - -"1000"/> + <entry action="menu-call-transfer" digits="2" param="1000"/> <entry action="menu-call-transfer" digits="3" param="1001"/> </menu> -->

1 0

[commit] r12608 - in freeswitch/trunk/scripts/contrib/swk: flex/amf-test1/src php/amfphp
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: silik0n Date: Sun Mar 15 00:24:32 2009 New Revision: 12608 Log: getting closer to something worth looking at DB is getting pretty close to being required (some functions will now fail if you dont have the DB setup) Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Sun Mar 15 00:24:32 2009 @@ -62,6 +62,45 @@ PopUpManager.createPopUp(this, statusForm, false); } + public function addDomainParam():void { + freeswitch.addDirDomainParam(gridDomainsDomain.selectedItem.uid, inputDomainParamName.text, inputDomainParamValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function addDomainVar():void { + freeswitch.addDirDomainVar(gridDomainsDomain.selectedItem.uid, inputDomainVarName.text, inputDomainVarValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainParam():void { + freeswitch.updateDirDomainParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, dgDomainParam.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainVars():void { + freeswitch.updateDirDomainVar(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, dgDomainVars.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function addDomainUserParam():void { + freeswitch.addDirDomainUserParam(gridDomainsDomain.selectedItem.uid, inputDomainParamName.text, inputDomainParamValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function addDomainUserVar():void { + freeswitch.addDirDomainUserVar(gridDomainsDomain.selectedItem.uid, inputDomainVarName.text, inputDomainVarValue.text); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainUserParam():void { + freeswitch.updateDirDomainUserParam(dgDomainParam.selectedItem.uid, dgDomainParam.selectedItem.name, dgDomainParam.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } + + public function dgChangeDomainUserVars():void { + freeswitch.updateDirDomainUserParam(dgDomainVars.selectedItem.uid, dgDomainVars.selectedItem.name, dgDomainVars.value); + freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid); + } ]]> </mx:Script> @@ -165,18 +204,32 @@ <mx:Label text="Name:" horizontalCenter="-129" top="12"/> <mx:TextInput id="domainName" text="{gridDomainsDomain.selectedItem.name}" horizontalCenter="25" top="10"/> <mx:CheckBox label="Enabled" id="domainEnabled" enabled="{gridDomainsDomain.selectedItem.enabled}" right="10" top="8"/> - <mx:DataGrid left="10" top="61" bottom="42" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}"> + <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.params}" + itemEditEnd="dgChangeDomainParam();" editable="true" id="dgDomainParam"> <mx:columns> <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> <mx:DataGridColumn headerText="Value" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:DataGrid right="10" top="61" bottom="42" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}"> + <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirDomain.lastResult.variables}" + itemEditEnd="dgChangeDomainVars();" editable="true" id="dgDomainVars"> <mx:columns> <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> + <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="-52"/> + <mx:Button label="Add Parameter" left="149" bottom="40" click="addDomainParam()"/> + <mx:Button label="Add Variable" bottom="40" right="168" width="99" click="addDomainVar()"/> + <mx:Button label="Add Domain" bottom="10" horizontalCenter="63"/> + <mx:Label text="Parameter" bottom="90" left="10"/> + <mx:TextInput width="121" id="inputDomainParamName" bottom="70" left="10"/> + <mx:TextInput width="272" id="inputDomainParamValue" bottom="70" left="139"/> + <mx:Label text="Variable" bottom="90" right="361"/> + <mx:TextInput width="121" id="inputDomainVarName" bottom="70" right="290"/> + <mx:TextInput width="272" id="inputDomainVarValue" bottom="70" right="10"/> + <mx:Label text="Data" bottom="90" right="251"/> + <mx:Label text="Value" bottom="90" left="139"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> @@ -184,7 +237,8 @@ <mx:HDividedBox x="0" y="0" width="100%" height="100%"> <mx:Canvas width="20%" height="100%"> <mx:ComboBox id="userDomain" top="10" horizontalCenter="0" dataProvider="{freeswitch.getDirDomains.lastResult}" labelField="name"></mx:ComboBox> - <mx:DataGrid width="100%" horizontalCenter="0" top="40" bottom="70" dataProvider="{freeswitch.getDirUsers.lastResult}"> + <mx:DataGrid id="dgDomainUsers" width="100%" horizontalCenter="0" top="40" bottom="70" dataProvider="{freeswitch.getDirUsers.lastResult}" + click="freeswitch.getDirUser(dgDomainUsers.selectedItem.uid)"> <mx:columns> <mx:DataGridColumn headerText="User" dataField="username" /> </mx:columns> @@ -193,8 +247,37 @@ <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="40" click="freeswitch.getDirDomains();"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:Form id="formUser" x="0" y="0" width="100%" height="100%"> - </mx:Form> + <mx:Label text="UID:" horizontalCenter="-421" top="10"/> + <mx:Label text="{dgDomainUsers.selectedItem.uid}" id="userUid" horizontalCenter="-339" top="10"/> + <mx:Label text="Name:" horizontalCenter="-129" top="12"/> + <mx:TextInput id="userName" text="{dgDomainUsers.selectedItem.username}" horizontalCenter="25" top="10"/> + <mx:CheckBox label="Enabled" id="userEnabled" enabled="{dgDomainUsers.selectedItem.enabled}" right="10" top="8"/> + <mx:DataGrid left="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.params}" + change="dgChangeDomainUserParam();" editable="true" id="dgDomainUserParam"> + <mx:columns> + <mx:DataGridColumn headerText="Parameter" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Value" dataField="value"/> + </mx:columns> + </mx:DataGrid> + <mx:DataGrid right="10" top="40" bottom="116" width="45%" dataProvider="{freeswitch.getDirUser.lastResult.variables}" + change="dgChangeDomainVars();" editable="true" id="dgDomainUserVars"> + <mx:columns> + <mx:DataGridColumn headerText="Variable" dataField="name" width="120"/> + <mx:DataGridColumn headerText="Data" dataField="value"/> + </mx:columns> + </mx:DataGrid> + <mx:Button label="Refresh Domain" bottom="10" horizontalCenter="-52"/> + <mx:Button label="Add Parameter" left="149" bottom="40" click="addDomainUserParam()"/> + <mx:Button label="Add Variable" bottom="40" right="168" width="99" click="addDomainUserVar()"/> + <mx:Button label="Add Domain" bottom="10" horizontalCenter="63"/> + <mx:Label text="Parameter" bottom="90" left="10"/> + <mx:TextInput width="121" id="inputDomainUserParamName" bottom="70" left="10"/> + <mx:TextInput width="272" id="inputDomainUserParamValue" bottom="70" left="139"/> + <mx:Label text="Variable" bottom="90" right="361"/> + <mx:TextInput width="121" id="inputDomainUserVarName" bottom="70" right="290"/> + <mx:TextInput width="272" id="inputDomainUserVarValue" bottom="70" right="10"/> + <mx:Label text="Data" bottom="90" right="251"/> + <mx:Label text="Value" bottom="90" left="139"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> @@ -221,7 +304,7 @@ <mx:DataGridColumn headerText="Available to Join" dataField="col1"/> </mx:columns> </mx:DataGrid> - <mx:Button x="10" y="572" label="Refresh"/> + <mx:Button label="Refresh" left="10" bottom="40"/> </mx:Canvas> </mx:HDividedBox> </mx:Canvas> Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Sun Mar 15 00:24:32 2009 @@ -281,12 +281,19 @@ return $results; } - public function addDirDomain($domain_name){ + public function getDirUser($user_uid){ + $dbh = $this->getDbh(); - $query = sprintf('insert into domains (name) values ("%s")', $domain_name); + $query = sprintf("select * from user_params where users_uid = $user_uid"); + $stmt = $dbh->query($query); + $results['params'] = $stmt->fetchAll(); - return $dbh->exec($query); + $query = sprintf("select * from user_variables where users_uid = $user_uid"); + $stmt = $dbh->query($query); + $results['variables'] = $stmt->fetchAll(); + + return $results; } public function getDirUsers($domain_uid){ @@ -309,10 +316,35 @@ return $results; } - + public function addDirDomain($domain_name){ + $dbh = $this->getDbh(); + $query = sprintf('insert into domains (name) values ("%s")', $domain_name); + return $dbh->exec($query); + } -} -/* For Emacs: + public function addDirDomainParam($domain_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('insert into domain_params (domain_uid, name, value) values (%s, "%s", "%s")', $domain_uid, $name, $value); + return $dbh->exec($query); + } + + public function addDirDomainVar($domain_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('insert into domain_variables (domain_uid, name, value) values (%s, "%s", "%s")', $domain_uid, $name, $value); + return $dbh->exec($query); + } + + public function updateDirDomainParam($param_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('update domain_params set name = "%s", value = "%s" where uid=%s', $param_uid, $name, $value); + return $dbh->exec($query); + } + + public function updateDirDomainVar($var_uid, $name, $value) { + $dbh = $this->getDbh(); + $query = sprintf('update domain_variables set name = "%s", value = "%s" where uid=%s', $var_uid, $name, $value); + return $dbh->exec($query); + } } /* For Emacs:

1 0

[commit] r12607 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Mar '09

15 Mar '09

Author: anthm Date: Sat Mar 14 20:21:34 2009 New Revision: 12607 Log: move stop up a bit Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Mar 14 20:21:34 2009 @@ -270,7 +270,6 @@ int nc = 0; /* TRUE if we are running in noconsole mode */ pid_t pid = 0; int x; - int die = 0; char *usageDesc; int alt_dirs = 0; int known_opt; @@ -470,8 +469,7 @@ } if (argv[x] && !strcmp(argv[x], "-stop")) { - die++; - known_opt++; + return freeswitch_kill_background(); } if (argv[x] && !strcmp(argv[x], "-nc")) { @@ -594,10 +592,6 @@ return 255; } - if (die) { - return freeswitch_kill_background(); - } - if (alt_dirs && alt_dirs != 3) { fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n"); return 255;

1 0