diff --git a/!Readme.txt/ATA.txt b/!Readme.txt/ATA.txt new file mode 100644 index 0000000..d561556 --- /dev/null +++ b/!Readme.txt/ATA.txt @@ -0,0 +1,64 @@ +https://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cata/186_188/2_15_ms/english/administration/guide/sccp/sccp/sccpaape.html + +Для работы Cisco ATA-186, 188 +обновление прошивки +--- linux +/sata186us.linux -any -d3 ATA030204SCCP090202A.zup + +Для работы Cisco ATA-186, 188 может потребоваться файл atadefault.cfg +---------- Config +cfgfmt.linux atadefault.txt atadefault.cfg + + +----------------------begin atadefault.txt --------------------- +#txt +UIPassword:0 +UseTftp:1 +TftpURL:0 +cfgInterval:3600 +EncryptKey:0 +ToConfig:0 +upgradecode:0,0x301,0x0400,0x0200,0.0.0.0,69,0,none +upgradelang:0,0x301,0x0400,0x0200,0.0.0.0,69,0,none +Dhcp:1 +StaticIp:0 +StaticRoute:0 +StaticNetMask:0 +CA0orCM0:172.30.122.41:2000 +CA1orCM1:0 +CA0UID:0 +CA1UID:0 +EPID0orSID0:. +EPID1orSID1:. +PrfCodec:1 +LBRCodec:3 +AudioMode:0x00350035 +NumTxFrames:2 +CallerIdMethod:0x00019e60 +ConnectMode:0x90000400 +DNS1IP:0.0.0.0 +DNS2IP:0.0.0.0 +UDPTOS:0xA0 +RingCadence:2,4,25 +DialTone:2,31538,30831,1380,1740,1,0,0,0 +BusyTone:2,30467,28959,1191,1513,0,4000,4000,0 +ReorderTone:2,30467,28959,1191,1513,0,2000,2000,0 +RingBackTone:2,30831,30467,1943,2111,0,16000,32000,0 +CallWaitTone:1,30831,0,5493,0,0,2400,2400,4800 +ConfirmTone:1,30467,0,5970,0,0,480,480,1920 +MediaPort:16384 +UseMGCP:0 +MGCPPort:2427 +RetxIntvl:500 +RetxLim:7 +MGCPVer:MGCP1.0 +NPrintf:0 +TraceFlags:0x00000000 +SigTimer:0x00000064 +CodecName:PCMU,PCMA,G723,G729 +OpFlags:0x2 +VLANSetting:0x0000002b +-----------------------end atadefault.txt ------------------ + + + diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index cd4b6d3..f3d6f9f 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -678,7 +678,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if (!empty($request[$value])) { $save_settings[$value] = $request[$value]; } else { - $save_settings[$value] = $val_null; // null + $save_settings[$value] = $this->val_null; // null } } $this->dbinterface->sccp_save_db('sccpdevmodel', $save_settings, $upd_mode, "model"); @@ -921,7 +921,11 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { switch ($vkey) { case 'inherit': if ($vval=='on') { - $arr_clear = TRUE; ; + $arr_clear = TRUE; + // Злобный РҐРђРљ + if ($key == 'permit') { + $save_settings['deny'] = 'NONE'; + } } break; case 'internal': @@ -2135,7 +2139,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } function getSccp_model_information($get = "all", $validate = false, $format_list = "all", $filter = array()) { - $file_ext = array('.loads', '.LOADS', '.sbn', '.SBN', '.bin', '.BIN'); + $file_ext = array('.loads', '.LOADS', '.sbn', '.SBN', '.bin', '.BIN','.zup','.ZUP'); $dir = $this->sccppath["tftp_path"]; $dir_tepl = $this->sccppath["tftp_templates"]; diff --git a/Sccp_manager.inc/srvinterface.class.php b/Sccp_manager.inc/srvinterface.class.php index 8b80ae0..a1927e5 100644 --- a/Sccp_manager.inc/srvinterface.class.php +++ b/Sccp_manager.inc/srvinterface.class.php @@ -305,7 +305,8 @@ class srvinterface { $line_arr = explode(' ', $line); $it = 1; do { - if (strpos($line_arr[$it + 1], 'SEP') === false) { + if ($this->strpos_array($line_arr[$it + 1], array('SEP', 'ATA', 'VG')) === false) { +// if (strpos($line_arr[$it + 1], 'SEP') === false) { $line_arr[0] .= ' ' . $line_arr[$it]; unset($line_arr[$it]); } else { @@ -355,5 +356,23 @@ class srvinterface { return false; } } + private function strpos_array($haystack, $needles) { + if (is_array($needles)) { + foreach ($needles as $str) { + if (is_array($str)) { + $pos = strpos_array($haystack, $str); + } else { + $pos = strpos($haystack, $str); + } + if ($pos !== FALSE) { + return $pos; + } + } + } else { + return strpos($haystack, $needles); + } + return FALSE; +} + } diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index 1934f75..632a140 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -379,14 +379,32 @@ $(document).ready(function () { $('.button-checkbox').on('click', '', function (e) { - if ($('button',this).hasClass('active')) { + settings = { + true: { + icon: 'glyphicon glyphicon-unchecked' + }, + false: { + icon: 'glyphicon glyphicon-check' + } + }; + var button_1 = $('button',this); + var isChecked = $('input', this).is(':checked'); + + if (button_1.find('.state-icon').length == 0) { + button_1.prepend('В '); + } else { + button_1.find('.state-icon') + .removeClass() + .addClass('state-icon ' + settings[isChecked].icon); + } + if (isChecked) { $('input', this).removeAttr('checked'); - $('button',this).removeClass('active'); + button_1.removeClass('active'); } else { $('input', this).attr('checked'); $('input', this).prop('checked','true'); - $('button',this).addClass('active'); - } + button_1.addClass('active'); + } }); diff --git a/conf/Sccp.class.php b/conf/Sccp.class.php index 99b8384..455651f 100644 --- a/conf/Sccp.class.php +++ b/conf/Sccp.class.php @@ -7,7 +7,7 @@ namespace FreePBX\modules\Core\Drivers; class Sccp extends \FreePBX\modules\Core\Driver { private $data_fld = array("pin"=>'pin', "label" => 'label', "accountcode" => 'account', - "context" =>'context',"incominglimit"=>'incominglimit', + "context" =>'lcontext',"incominglimit"=>'incominglimit', "callgroup"=>'callgroup',"pickupgroup"=>'pickupgroup', "transfer" => 'transfer', "echocancel" => 'echocancel', "language" => 'language', "description" => 'callerid', @@ -113,7 +113,7 @@ class Sccp extends \FreePBX\modules\Core\Driver { "value" => "", "flag" => $flag++ ), - "context" => array( + "lcontext" => array( "value" => "from-internal", "flag" => $flag++ ), @@ -183,7 +183,7 @@ class Sccp extends \FreePBX\modules\Core\Driver { $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 1); $tt = _("Asterisk context which this line will use to send and receive calls (Note: Only change this is you know what you are doing)."); - $tmparr['context'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1); + $tmparr['lcontext'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1); // !TODO!: -TODO-: Maybe completely remove support for old numberic callgroup/pickupgroup in favor of the named version ? See Sccp.class.php.v431 $tt = _("Phone call group (numeric only, example:1,3-4)"); diff --git a/conf/Sccp.class.php.v431 b/conf/Sccp.class.php.v431 index 960563d..d89f319 100644 --- a/conf/Sccp.class.php.v431 +++ b/conf/Sccp.class.php.v431 @@ -9,9 +9,9 @@ namespace FreePBX\modules\Core\Drivers; class Sccp extends \FreePBX\modules\Core\Driver { public $version; - +// Key (db) = > key Settings private $data_fld = array("pin"=>'pin', "label" => 'label', "accountcode" => 'account', - "context" =>'context',"incominglimit"=>'incominglimit', + "context" =>'lcontext',"incominglimit"=>'incominglimit', // "callgroup"=>'callgroup',"pickupgroup"=>'pickupgroup', 'namedcallgroup'=>'namedcallgroup', 'namedpickupgroup' => 'namedpickupgroup', "transfer" => 'transfer', "echocancel" => 'echocancel', @@ -189,7 +189,7 @@ class Sccp extends \FreePBX\modules\Core\Driver { "value" => "2", "flag" => $flag++ ), - "context" => array( + "lcontext" => array( "value" => "from-internal", "flag" => $flag++ ), @@ -263,9 +263,12 @@ class Sccp extends \FreePBX\modules\Core\Driver { $tt = _("The SCCP channel number for this port. If you plaining to use this line as 'Shared' or use on several devices - leave this field blank or set limit to 10 calls."); // $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel); // $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section, 'category' => 'general'); - $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section); - $tt = _("Asterisk context this device will send calls to. Only change this is you know what you are doing."); - $tmparr['context'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1, 'section' => $section); + + $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section); + + $tt = _("Asterisk context this device will send calls to. Only change this is you know what you are doing."); + $tmparr['lcontext'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1, 'section' => $section); + // $tt = _("Phone call group callgroup=1,3-4"); // $tmparr['callgroup'] = array('prompttext' => _('Call group id'),'value' => '', 'tt' => $tt, 'level' => 1, 'section' => $section); diff --git a/conf/sccpgeneral.xml.v431 b/conf/sccpgeneral.xml.v431 index edff30b..630da38 100644 --- a/conf/sccpgeneral.xml.v431 +++ b/conf/sccpgeneral.xml.v431 @@ -135,25 +135,11 @@ and open the template in the editor. Base Version before all crash :-) - Add Alow network + + + Add Allow Range Alow network settings. Blank fields will be ignored used Network 0.0.0.0/0.0.0.0 to resolve any existing connections. You can use the 'internal' connections only from the networks connected to the server. - - - deny - 0.0.0.0/0.0.0.0 - - - - - - - - - Add Deny network - All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'. - @@ -168,9 +154,27 @@ and open the template in the editor. Base Version before all crash :-) - Add local networks + + + Add Internal Range Local network settings. Blank fields will be ignored used Network 0.0.0.0. + + + deny + 0.0.0.0/0.0.0.0 + + + + + + + + + + + Add Deny network + All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'. + + @@ -1095,12 +1099,13 @@ and open the template in the editor. Base Version before all crash :-) - dtmfmode + force_dtmfmode - outofband - - - Dual-Tone Multi-Frequency: outofband is the native cisco dtmf tone play + auto + + + + Some phone models with bad firmware do send dtmf in a messed up order and need to be forced to skinny mode. mwioncall @@ -1171,43 +1176,83 @@ and open the template in the editor. Base Version before all crash :-) - + + + custom_network_acc + + permit + + + + Help. + + + custom_network_type + + ipv4 + + + Help. + + + + + custom_network_v + + + sccp-custom + + + custom_network_m + + sccp-custom + + + Help. + + + + + + + deny + / + sccp_hw_net_inherit + + + + + + + + + Add Deny network + All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'. + + permit NONE Inherit - false + false sccp_hw-ar_permit-grinternal + + sccp_hw_net_inherit - Add Alow network + + + Add Alow network Alow network settings. Blank fields will be ignored used Network 0.0.0.0. - - - deny - / - - - - - - - - - Add Deny network - All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'. - nat diff --git a/install.php b/install.php index d546d3b..0bec247 100644 --- a/install.php +++ b/install.php @@ -34,6 +34,7 @@ function Get_DB_config($sccp_compatible) { 'permit' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"), 'backgroundImage' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"), 'ringtone' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"), +// 'force_dtmfmode' => array('create' => "VARCHAR(10) default 'auto'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'auto'), 'transfer' => array('def_modify' => "on"), 'cfwdall' => array('def_modify' => "on"), 'cfwdbusy' => array('def_modify' => "on"), @@ -70,7 +71,7 @@ function Get_DB_config($sccp_compatible) { ) ); /* Old */ - $db_config_v5 = array( + $db_config_v_test = array( 'sccpdevmodel' => array( 'enabled' => array('create' => "INT(2) NULL DEFAULT '0'"), 'nametemplate' => array('create' => 'VARCHAR(50) NULL DEFAULT NULL'), @@ -88,6 +89,7 @@ function Get_DB_config($sccp_compatible) { 'useRedialMenu' => array('create' => "VARCHAR(5) NULL DEFAULT 'no' AFTER `_hwlang`"), //'dtmfmode' => array('create' => "VARCHAR(10) default 'outofband'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'outofband'), 'dtmfmode' => array('drop' => "yes"), +// 'force_dtmfmode' => array('create' => "VARCHAR(10) default 'auto'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'auto'), 'deny' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"), 'permit' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"), 'backgroundImage' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"), @@ -151,6 +153,7 @@ function Get_DB_config($sccp_compatible) { 'useRedialMenu' => array('create' => "VARCHAR(5) NULL DEFAULT 'no' AFTER `_hwlang`"), //'dtmfmode' => array('create' => "VARCHAR(10) default 'outofband'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'outofband'), 'dtmfmode' => array('drop' => "yes"), +// 'force_dtmfmode' => array('create' => "VARCHAR(10) default 'auto'", 'modify' => "VARCHAR(10)", 'def_modify'=> 'auto'), 'deny' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"), 'permit' => array('create' => 'VARCHAR(100) NULL DEFAULT NULL', 'modify' => "VARCHAR(100)"), 'backgroundImage' => array('create' => 'VARCHAR(255) NULL DEFAULT NULL', 'modify' => "VARCHAR(255)"), @@ -433,7 +436,7 @@ function InstallDB_fillsccpdevmodel() { "('12 SP+', 'CISCO', 1, 1, '', 'loadInformation2', 0, NULL), ('30 SP+', 'CISCO', 1, 1, '', 'loadInformation1', 0, NULL), ('30 VIP', 'CISCO', 1, 1, '', 'loadInformation5', 0, NULL), ('3911', 'CISCO', 1, 1, '', 'loadInformation446', 0, NULL), ('3951', 'CISCO', 1, 1, '', 'loadInformation412', 0, ''), ('6901', 'CISCO', 1, 0, 'SCCP6901.9-2-1-a', 'loadInformation547', 0, NULL), ('6911', 'CISCO', 1, 0, 'SCCP6911.9-2-1-a', 'loadInformation548', 0, NULL), ('6921', 'CISCO', 1, 0, 'SCCP69xx.9-2-1-0', 'loadInformation496', 0, NULL), ('6941', 'CISCO', 1, 1, 'SCCP69xx.9-2-1-0', 'loadInformation495', 0, NULL), ('6945', 'CISCO', 1, 0, 'SCCP6945.9-2-1-0', 'loadInformation564', 0, NULL), ('6961', 'CISCO', 1, 0, 'SCCP69xx.9-2-1-0', 'loadInformation497', 0, NULL), ('7902', 'CISCO', 1, 1, 'CP7902080002SCCP060817A', 'loadInformation30008', 0, NULL), " . "('7905', 'CISCO', 1, 1, 'CP7905080003SCCP070409A', 'loadInformation20000', 0, NULL), ('7906', 'CISCO', 1, 1, 'SCCP11.9-2-1S', 'loadInformation369', 1, 'SEP0000000000.cnf.xml_791x_template'), ('7910', 'CISCO', 1, 1, 'SCCP11.9-2-1S', 'loadInformation6', 1, 'SEP0000000000.cnf.xml_791x_template'), ('7911', 'CISCO', 1, 1, 'SCCP11.9-2-1S', 'loadInformation307', 1, 'SEP0000000000.cnf.xml_791x_template'), ('7912', 'CISCO', 1, 1, 'CP7912080004SCCP080108A', 'loadInformation30007', 0, NULL), ('7914', 'CISCO', 0, 14, 'S00105000400', 'loadInformation124', 1, NULL),('7914,7914', 'CISCO', 0, 28, 'S00105000400', 'loadInformation124', 1, NULL), ('7915', 'CISCO', 0, 24, 'B015-1-0-4', 'loadInformation227', 1, NULL), ('7915,7915', 'CISCO', 0, 48, 'B015-1-0-4', 'loadInformation228', 1, NULL), ('7916', 'CISCO', 0, 24, 'B015-1-0-4', 'loadInformation229', 1, NULL), " . "('7916,7916', 'CISCO', 0, 48, 'B016-1-0-4', 'loadInformation230', 1, NULL), ('7920', 'CISCO', 1, 1, 'cmterm_7920.4.0-03-02', 'loadInformation30002', 0, NULL), ('7921', 'CISCO', 1, 1, 'CP7921G-1.4.1SR1', 'loadInformation365', 0, NULL),('7925', 'CISCO', 1, 6, 'CP7925G-1.4.1SR1', 'loadInformation484', 0, NULL), ('7926', 'CISCO', 1, 1, 'CP7926G-1.4.1SR1', 'loadInformation557', 0, NULL), ('7931', 'CISCO', 1, 34, 'SCCP31.9-2-1S', 'loadInformation348', 0, NULL), ('7935', 'CISCO', 1, 2, 'P00503021900', 'loadInformation9', 0, NULL), ('7936', 'CISCO', 1, 1, 'cmterm_7936.3-3-21-0', 'loadInformation30019', 0, NULL), ('7937', 'CISCO', 1, 1, 'apps37sccp.1-4-4-0', 'loadInformation431', 0, 'SEP0000000000.cnf.xml_7937_template'), ('7940', 'CISCO', 1, 2, 'P0030801SR02', 'loadInformation8', 1, 'SEP0000000000.cnf.xml_796x_template'), " . - "('7941', 'CISCO', 1, 2, 'SCCP41.9-2-1S', 'loadInformation115', 0, 'SEP0000000000.cnf.xml_796x_template'),('7941G-GE', 'CISCO', 1, 2, 'SCCP41.9-2-1S', 'loadInformation309', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7942', 'CISCO', 1, 2, 'SCCP42.9-2-1S', 'loadInformation434', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7945', 'CISCO', 1, 2, 'SCCP45.9-2-1S', 'loadInformation435', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7960', 'CISCO', 3, 6, 'P0030801SR02', 'loadInformation7', 1, 'SEP0000000000.cnf.xml_796x_template'), ('7961', 'CISCO', 3, 6, 'SCCP41.9-2-1S', 'loadInformation30018', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7961G-GE', 'CISCO', 3, 6, 'SCCP41.9-2-1S', 'loadInformation308', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7962', 'CISCO', 3, 6, 'SCCP42.9-2-1S', 'loadInformation404', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7965', 'CISCO', 3, 6, 'SCCP45.9-2-1S', 'loadInformation436', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7970', 'CISCO', 3, 8, 'SCCP70.9-2-1S', 'loadInformation30006', 0, NULL), ('7971', 'CISCO', 1, 2, 'SCCP75.9-2-1S', 'loadInformation119', 0, NULL), ('7975', 'CISCO', 3, 8, 'SCCP75.9-2-1S', 'loadInformation437', 0, NULL), ('7985', 'CISCO', 3, 8, 'cmterm_7985.4-1-7-0', 'loadInformation302', 0, NULL), ('8941', 'CISCO', 1, 0, 'SCCP894x.9-2-2-0', 'loadInformation586', 0, NULL), ('8945', 'CISCO', 1, 0, 'SCCP894x.9-2-2-0', 'loadInformation585', 0, NULL), ('ATA 186', 'CISCO', 1, 2, 'ATA030204SCCP090202A', 'loadInformation12', 0, NULL), ('ATA 187', 'CISCO', 1, 2, 'ATA187.9-2-3-1', 'loadInformation550', 0, NULL), ('CN622', 'MOTOROLA', 1, 1, '', 'loadInformation335', 0, NULL), ('Digital Access', 'CISCO', 1, 1, 'D001M022', 'loadInformation40', 0, NULL), ('Digital Access+', 'CISCO', 1, 1, 'D00303010033', 'loadInformation42', 0, NULL), ('E-Series', 'NOKIA', 1, 1, '', '', 0, NULL), ('ICC', 'NOKIA', 1, 1, '', '', 0, NULL), " . + "('7941', 'CISCO', 1, 2, 'SCCP41.9-2-1S', 'loadInformation115', 0, 'SEP0000000000.cnf.xml_796x_template'),('7941G-GE', 'CISCO', 1, 2, 'SCCP41.9-2-1S', 'loadInformation309', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7942', 'CISCO', 1, 2, 'SCCP42.9-2-1S', 'loadInformation434', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7945', 'CISCO', 1, 2, 'SCCP45.9-2-1S', 'loadInformation435', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7960', 'CISCO', 3, 6, 'P0030801SR02', 'loadInformation7', 1, 'SEP0000000000.cnf.xml_796x_template'), ('7961', 'CISCO', 3, 6, 'SCCP41.9-2-1S', 'loadInformation30018', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7961G-GE', 'CISCO', 3, 6, 'SCCP41.9-2-1S', 'loadInformation308', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7962', 'CISCO', 3, 6, 'SCCP42.9-2-1S', 'loadInformation404', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7965', 'CISCO', 3, 6, 'SCCP45.9-2-1S', 'loadInformation436', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7970', 'CISCO', 3, 8, 'SCCP70.9-2-1S', 'loadInformation30006', 0, NULL), ('7971', 'CISCO', 1, 2, 'SCCP75.9-2-1S', 'loadInformation119', 0, NULL), ('7975', 'CISCO', 3, 8, 'SCCP75.9-2-1S', 'loadInformation437', 0, NULL), ('7985', 'CISCO', 3, 8, 'cmterm_7985.4-1-7-0', 'loadInformation302', 0, NULL), ('8941', 'CISCO', 1, 0, 'SCCP894x.9-2-2-0', 'loadInformation586', 0, NULL), ('8945', 'CISCO', 1, 0, 'SCCP894x.9-2-2-0', 'loadInformation585', 0, NULL), ('ATA 186', 'CISCO', 1, 1, 'ATA030204SCCP090202A', 'loadInformation12', 0, NULL), ('ATA 187', 'CISCO', 1, 1, 'ATA187.9-2-3-1', 'loadInformation550', 0, NULL), ('CN622', 'MOTOROLA', 1, 1, '', 'loadInformation335', 0, NULL), ('Digital Access', 'CISCO', 1, 1, 'D001M022', 'loadInformation40', 0, NULL), ('Digital Access+', 'CISCO', 1, 1, 'D00303010033', 'loadInformation42', 0, NULL), ('E-Series', 'NOKIA', 1, 1, '', '', 0, NULL), ('ICC', 'NOKIA', 1, 1, '', '', 0, NULL), " . "('Analog Access', 'CISCO', 1, 1, 'A001C030', 'loadInformation30', 0, ''),('WS-X6608', 'CISCO', 1, 1, 'D00404000032', 'loadInformation43', 0, ''), ('WS-X6624', 'CISCO', 1, 1, 'A00204000013', 'loadInformation43', 0, ''), ('WS-X6608', 'CISCO', 1, 1, 'C00104000003', 'loadInformation51', 0, ''), ('H.323 Phone', 'CISCO', 1, 1, '', 'loadInformation61', 0, ''), ('Simulator', 'CISCO', 1, 1, '', 'loadInformation100', 0, ''), ('MTP', 'CISCO', 1, 1, '', 'loadInformation111', 0, ''), ('MGCP Station', 'CISCO', 1, 1, '', 'loadInformation120', 0, ''), ('MGCP Trunk', 'CISCO', 1, 1, '', 'loadInformation121', 0, ''), ('UPC', 'CISCO', 1, 1, '', 'loadInformation358', 0, ''), ". "('TelePresence', 'TELEPRESENCE', 1, 1, '', 'loadInformation375', 0, ''), ('1000', 'TELEPRESENCE', 1, 1, '', 'loadInformation478', 0, ''), ('3000', 'TELEPRESENCE', 1, 1, '', 'loadInformation479', 0, ''), ('3200', 'TELEPRESENCE', 1, 1, '', 'loadInformation480', 0, ''), ('500-37', 'TELEPRESENCE', 1, 1, '', 'loadInformation481', 0, ''), ('1300-65', 'TELEPRESENCE', 1, 1, '', 'loadInformation505', 0, ''), ('1100', 'TELEPRESENCE', 1, 1, '', 'loadInformation520', 0, ''), ('200', 'TELEPRESENCE', 1, 1, '', 'loadInformation557', 0, ''), ('400', 'TELEPRESENCE', 1, 1, '', 'loadInformation558', 0, ''), ('EX90', 'TELEPRESENCE', 1, 1, '', 'loadInformation584', 0, ''), ('500-32', 'TELEPRESENCE', 1, 1, '', 'loadInformation590', 0, ''), ('1300-47', 'TELEPRESENCE', 1, 1, '', 'loadInformation591', 0, ''), ('TX1310-65', 'TELEPRESENCE', 1, 1, '', 'loadInformation596', 0, ''), ('EX60', 'TELEPRESENCE', 1, 1, '', 'loadInformation604', 0, ''), ('C90', 'TELEPRESENCE', 1, 1, '', 'loadInformation606', 0, ''), ('C60', 'TELEPRESENCE', 1, 1, '', 'loadInformation607', 0, ''), ('C40', 'TELEPRESENCE', 1, 1, '', 'loadInformation608', 0, ''), ('C20', 'TELEPRESENCE', 1, 1, '', 'loadInformation609', 0, ''), ('C20-42', 'TELEPRESENCE', 1, 1, '', 'loadInformation610', 0, ''), ('C60-42', 'TELEPRESENCE', 1, 1, '', 'loadInformation611', 0, ''), ('C40-52', 'TELEPRESENCE', 1, 1, '', 'loadInformation612', 0, ''), ('C60-52', 'TELEPRESENCE', 1, 1, '', 'loadInformation613', 0, ''), ('C60-52D', 'TELEPRESENCE', 1, 1, '', 'loadInformation614', 0, ''),('C60-65', 'TELEPRESENCE', 1, 1, '', 'loadInformation615', 0, ''), ('C90-65', 'TELEPRESENCE', 1, 1, '', 'loadInformation616', 0, ''), ('MX200', 'TELEPRESENCE', 1, 1, '', 'loadInformation617', 0, ''), ('TX9000', 'TELEPRESENCE', 1, 1, '', 'loadInformation619', 0, ''), ('TX9200', 'TELEPRESENCE', 1, 1, '', 'loadInformation620', 0, ''), ('SX20', 'TELEPRESENCE', 1, 1, '', 'loadInformation626', 0, ''), ('MX300', 'TELEPRESENCE', 1, 1, '', 'loadInformation627', 0, ''), ('C40-42', 'TELEPRESENCE', 1, 1, '', 'loadInformation633', 0, ''), ('Jabber', 'CISCO', 1, 1, '', 'loadInformation652', 0, ''), ". "('S60', 'NOKIA', 0, 1, '', 'loadInformation376', 0, ''), ('9971', 'CISCO', 1, 1, '', 'loadInformation493', 0, ''), ('9951', 'CISCO', 1, 1, '', 'loadInformation537', 0, ''), ('8961', 'CISCO', 1, 1, '', 'loadInformation540', 0, ''), ('Iphone', 'APPLE', 0, 1, '', 'loadInformation562', 0, ''), ('Android', 'ANDROID', 0, 1, '', 'loadInformation575', 0, ''), ('7926', 'CISCO', 1, 1, 'CP7926G-1.4.5.3', 'loadInformation577', 0, ''), ('7821', 'CISCO', 1, 1, '', 'loadInformation621', 0, ''), ('7841', 'CISCO', 1, 1, '', 'loadInformation622', 0, ''), ('7861', 'CISCO', 1, 1, '', 'loadInformation623', 0, ''), ('VXC 6215', 'CISCO', 1, 1, '', 'loadInformation634', 0, ''), ('8831', 'CISCO', 1, 1, '', 'loadInformation659', 0, ''), ('8841', 'CISCO', 1, 1, '', 'loadInformation683', 0, ''), ('8851', 'CISCO', 1, 1, '', 'loadInformation684', 0, ''), ('8861', 'CISCO', 1, 1, '', 'loadInformation685', 0, ''), ". diff --git a/views/formShow.php b/views/formShow.php index e0c7841..1f2ad62 100644 --- a/views/formShow.php +++ b/views/formShow.php @@ -28,8 +28,6 @@ $day_format = array("D.M.Y", "D.M.YA", "Y.M.D", "YA.M.D", "M-D-Y", "M-D-YA", "D- "D/M/Y", "D/M/YA", "Y/M/D", "YA/M/D", "M/D/Y", "M/D/YA"); $mysql_table = array("sccpdevice","sccpdeviceconfig"); //$time_zone_name = timezone_identifiers_list(); -//$time_zone = array("-12", "-11", "-10", "-09", "-08", "-07", "-06", "-05", "-04", "-03", "-02", "-01", "00", -// "01","02","03","04","05","06","07","08","09","10","11","12"); $time_zone = array('-12' => 'GTM -12', '-11' => 'GTM -11', '-10' => 'GTM -10', '-09' => 'GTM -9', '-08' => 'GTM -8', '-07' => 'GTM -7', '-06' => 'GTM -6', '-05' => 'GTM -5', '-04' => 'GTM -4', '-03' => 'GTM -3', '-02' => 'GTM -2', '-01' => 'GTM -1', @@ -218,14 +216,18 @@ foreach ($items as $child) { $opt_class .= " ".(string)$value->class; } - echo ''; - echo ''; + echo ''; } echo ''; } - ?> -
- class)) { + $opt_class .= " ".(string)$child->class; + } + echo '
'; + foreach ($res_value as $dat_v) { ?>
> @@ -252,20 +254,22 @@ foreach ($items as $child) { $i2 ++; } + if (!empty($child->add_pluss)) { + echo ''; + } echo '
'; $i++; } ?>
-
- addbutton).'" />'; - ?> -
+ addbutton)) { + echo '
'; + echo ''; + echo '
'; + } + ?>
diff --git a/views/server.setting.php b/views/server.setting.php index 5e82364..5af46f2 100644 --- a/views/server.setting.php +++ b/views/server.setting.php @@ -11,6 +11,9 @@
+ ShowGroup('sccp_general',1); @@ -21,3 +24,28 @@ ?>
+ + + +