diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index 78c898b..ecaf49f 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -1611,7 +1611,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if (!empty($value[0])) { if (!in_array($value[0], array('0.0.0.0', '127.0.0.1'), true)) { $xnode_obj = clone $xnode->member; - $xnode_obj['priority'] = $ifc; //$xnode_obj = &$xnode -> member -> callManager; $xnode_obj->callManager->name = $this->sccpvalues['servername']['data']; diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index 8750a9e..ba50225 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -396,7 +396,7 @@ $(document).ready(function () { // $("#add_new_model").modal('hide'); } - if ($(this).data('id') === 'model_applay') { + if ($(this).data('id') === 'model_apply') { var dev_cmd = 'model_update'; var dev_fld = ["model", "loadimage", "nametemplate"]; datas = ''; @@ -609,7 +609,7 @@ function load_oncliсk(e, data) { opts_idx = j; } } - if (opts_idx => 0) { + if (opts_idx >= 0) { $('#destination_' + dev_fld[i]).append($(opts[opts_idx]).clone()); $(opts[opts_idx]).remove(); } diff --git a/conf/sccpgeneral.xml b/conf/sccpgeneral.xml index fee14a1..a697f54 100644 --- a/conf/sccpgeneral.xml +++ b/conf/sccpgeneral.xml @@ -5,15 +5,15 @@ To change this template file, choose Tools | Templates and open the template in the editor. Base Version before all crash :-) --> - - + + dev_sshUserId cisco Help. - + dev_sshPassword cisco @@ -50,17 +50,17 @@ and open the template in the editor. Base Version before all crash :-) 2000 sccp-custom - Bind Address: The address to bind to for SCCP. In general, it should be set to '0.0.0.0'. If you find problems with one-way audio, you can set this to a specific address in the server. Note that '127.0.0.1' is always wrong here. + Bind Address: The address to bind to for SCCP. In general, it should be set to '0.0.0.0'. If you find problems with one-way audio, you can set this to a specific address in the server. Note that '127.0.0.1' is always wrong here. Also note that placing in your external IP address will cause the chan_sccp module to not load. A manual edit of the /etc/asterisk/sccp.conf file will be needed to fix and reload the module. : - + externip sccp-custom - External IP Address of the firewall, required in case the PBX is running on a seperate host behind it. IP Address that we're going to notify in RTP media stream as the pbx source address. + External IP Address of the firewall, required in case the PBX is running on a separate host behind it. IP Address that we're going to notify in RTP media stream as the pbx source address. / @@ -85,13 +85,13 @@ and open the template in the editor. Base Version before all crash :-) - + permit 0.0.0.0/0.0.0.0 - - Alow network settings. Blank fields will be ignored used Network 0.0.0.0. + + Allow network settings. Blank fields will be ignored, use Network 0.0.0.0. @@ -130,7 +130,7 @@ and open the template in the editor. Base Version before all crash :-) devlang - Russian_Russia + English_United_States The user locale allows the phone to display text (menu items, soft keys etc.) native to the phone's language. @@ -145,7 +145,7 @@ and open the template in the editor. Base Version before all crash :-) number - First Digit Timeout: The amount of time after your first digit to start dialing automatically. This can be over-ridden with settings in your dialplan.xml or by using the 'immediate dial' button. + First Digit Timeout: The amount of time after your first digit to start dialing automatically. This can be over-ridden with in your dialplan.xml or by using the 'immediate dial' button. @@ -294,7 +294,7 @@ and open the template in the editor. Base Version before all crash :-) dev_servicesURL - + @@ -311,7 +311,7 @@ and open the template in the editor. Base Version before all crash :-) dev_idleURL - + @@ -320,7 +320,7 @@ and open the template in the editor. Base Version before all crash :-) dev_informationURL - + @@ -336,7 +336,7 @@ and open the template in the editor. Base Version before all crash :-) dev_directoryURL - + This is the URL for a CiscoIPPhoneMenu which gets appended to the end of the Missed/Received/Placed calls. I don't use it (I find it makes more sense to put my phone book under services) @@ -344,7 +344,7 @@ and open the template in the editor. Base Version before all crash :-) dev_proxyServerURL - + @@ -419,7 +419,7 @@ and open the template in the editor. Base Version before all crash :-) Be careful with this function. Especially not to the internet. So i would restring the deny/permit to 'internal' by default in that case. - Alow =Specify a list of your networks, for example: 192.168.1.0 + Allow =Specify a list of your networks, for example: 192.168.1.0 deny =0.0.0.0/0.0.0.0 permit =internal hotline_context =sccp @@ -495,7 +495,7 @@ and open the template in the editor. Base Version before all crash :-) no - Enables and disables auto line selection. + Enables and Disables auto line selection. meetme no @@ -685,7 +685,7 @@ and open the template in the editor. Base Version before all crash :-) sccp-custom - The ringtone that the phone will default to. Can be overridden in the phone. The files RINGLIST.XML provice the basic phone ring tones, while DISTINCTIVERINGLIST.XML defines the list of possible ring tones for your other line types. They, along with the actual 'raw' ringtones, are stored in the /tftpboot/ directory with the rest of the config files. + The ringtone that the phone will default to. Can be overridden in the phone. The file RINGLIST.XML provides the basic phone ring tones, while DISTINCTIVERINGLIST.XML defines the list of possible ring tones for your other line types. They, along with the actual 'raw' ringtones, are stored in the /tftpboot/ directory with the rest of the config files. @@ -708,11 +708,11 @@ and open the template in the editor. Base Version before all crash :-) Transfer allowed - cfwdall + cfwdall no - Activate the callforward softkeys. Default is On + Activate the Callforward Softkeys. Default is On cfwdbusy no @@ -756,7 +756,7 @@ and open the template in the editor. Base Version before all crash :-) Set the MWI lamp style when MWI active to on, off, wink, flash or blink - directed_pickup + directed_pickup yes @@ -774,7 +774,7 @@ and open the template in the editor. Base Version before all crash :-) sccp-custom - Context where direct pickup search for extensions. if not set current contect will be use. + Context where direct pickup search for extensions. if not set current contact will be use. @@ -782,7 +782,7 @@ and open the template in the editor. Base Version before all crash :-) conf_allow - + yes @@ -838,8 +838,8 @@ and open the template in the editor. Base Version before all crash :-) / - - Alow network settings. Blank fields will be ignored used Network 0.0.0.0. + + Allow network settings. Blank fields will be ignored used Network 0.0.0.0. @@ -876,7 +876,7 @@ and open the template in the editor. Base Version before all crash :-) - The audio strem will be open in the progress and connected state. Valid options: none, progress, offhook, dial, ringout. Default may be Progress. + The audio stream will be open in the progress and connected state. Valid options: none, progress, offhook, dial, ringout. Default may be Progress. @@ -886,7 +886,7 @@ and open the template in the editor. Base Version before all crash :-) form-control - Help. + @@ -929,7 +929,7 @@ and open the template in the editor. Base Version before all crash :-) CallWaiting-3 CallWaiting-4 - Alow network settings. Blank fields will be ignored used Network 0.0.0.0. + Allow network settings. Blank fields will be ignored used Network 0.0.0.0. @@ -989,7 +989,7 @@ and open the template in the editor. Base Version before all crash :-) - Help. + @@ -999,7 +999,7 @@ and open the template in the editor. Base Version before all crash :-) - Help. + diff --git a/views/advserver.model.php b/views/advserver.model.php index 75bad43..a742931 100644 --- a/views/advserver.model.php +++ b/views/advserver.model.php @@ -36,7 +36,7 @@ - + @@ -194,7 +194,7 @@ diff --git a/views/form.buttons.php b/views/form.buttons.php index 3fb3db6..f86c75e 100644 --- a/views/form.buttons.php +++ b/views/form.buttons.php @@ -64,8 +64,8 @@ if (!empty($_REQUEST['new_id'])) {