ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

- Bug Fix

Browse source
This commit is contained in:
PhantomVl 2019-05-18 11:34:32 +03:00 committed by Diederik de Groot
parent eac9efb5ee
commit 2146a78e11
No known key found for this signature in database
GPG key ID: AFA728250A1BECD6
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
views/formShow.php
View file

@ -35,7 +35,9 @@ $time_zone = array('-12' => 'GTM -12', '-11' => 'GTM -11', '-10' => 'GTM -10', '
'04' => 'GTM +4', '05' => 'GTM +5', '06' => 'GTM +6', '07' => 'GTM +7', '04' => 'GTM +4', '05' => 'GTM +5', '06' => 'GTM +6', '07' => 'GTM +7',
'08' => 'GTM +8', '09' => 'GTM +9', '10' => 'GTM +10', '11'=> 'GTM +11', '12' => 'GTM +12'); '08' => 'GTM +8', '09' => 'GTM +9', '10' => 'GTM +10', '11'=> 'GTM +11', '12' => 'GTM +12');
$time_zone_name = \FreePBX::Sccp_manager()-> extconfigs-> getextConfig('cisco_timezone'); $time_zone_name = array();
//$time_zone_name = \FreePBX::Sccp_manager()-> extconfigs-> getextConfig('cisco_timezone');
//$time_zone = \FreePBX::Sccp_manager()-> extconfigs-> getextConfig('cisco_time'); //$time_zone = \FreePBX::Sccp_manager()-> extconfigs-> getextConfig('cisco_time');
//$system_time_zone = \FreePBX::Sccp_manager()->getSysnemTimeZone(); //$system_time_zone = \FreePBX::Sccp_manager()->getSysnemTimeZone();
//print_r($metainfo); //print_r($metainfo);
@ -53,13 +55,17 @@ if (function_exists('music_list')){
if (!is_array($moh_list)){ if (!is_array($moh_list)){
$moh_list = array('default'); $moh_list = array('default');
} }
$sofkey_list = \FreePBX::Sccp_manager()-> srvinterface -> sccp_list_keysets(); $sofkey_list = array();
$model_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWDevice"); $model_list = array();
$extension_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWextension"); $extension_list = array();
$device_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("SccpDevice"); $device_list = array();
$extension_list[]=array(model=>'NONE', vendor=>'CISCO', dns=>'0'); //$sofkey_list = \FreePBX::Sccp_manager()-> srvinterface -> sccp_list_keysets();
$device_list[]=array(name=>'NONE', description=>'No Device'); // $model_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWDevice");
//$extension_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWextension");
//$device_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("SccpDevice");
//$extension_list[]=array(model=>'NONE', vendor=>'CISCO', dns=>'0');
//$device_list[]=array(name=>'NONE', description=>'No Device');
$items = $itm -> children(); $items = $itm -> children();
@ -420,6 +426,9 @@ foreach ($items as $child) {
$select_opt= $moh_list; $select_opt= $moh_list;
} }
if ($child['type'] == 'SLK') { if ($child['type'] == 'SLK') {
if (empty($sofkey_list)) {
$sofkey_list = \FreePBX::Sccp_manager()-> srvinterface -> sccp_list_keysets();
}
$select_opt= $sofkey_list; $select_opt= $sofkey_list;
} }
// if ($child['type'] == 'SLZ') { // if ($child['type'] == 'SLZ') {
@ -484,6 +493,9 @@ foreach ($items as $child) {
$select_opt= $tftp_lang; $select_opt= $tftp_lang;
} }
if ($child['type'] == 'SLZN') { if ($child['type'] == 'SLZN') {
if (empty($time_zone_name)) {
$time_zone_name = \FreePBX::Sccp_manager()-> extconfigs-> getextConfig('cisco_timezone');
}
$select_opt= $time_zone_name; $select_opt= $time_zone_name;
} }
if ($child['type'] == 'SLZ') { if ($child['type'] == 'SLZ') {
@ -637,12 +649,23 @@ foreach ($items as $child) {
$child->class = 'form-control'; $child->class = 'form-control';
} }
if ($child['type'] == 'SDM') { if ($child['type'] == 'SDM') {
if (empty($model_list)) {
$model_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWDevice");
}
$select_opt= $model_list; $select_opt= $model_list;
} }
if ($child['type'] == 'SDE') { if ($child['type'] == 'SDE') {
if (empty($extension_list)) {
$extension_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("HWextension");
$extension_list[]=array(model=>'NONE', vendor=>'CISCO', dns=>'0');
}
$select_opt= $extension_list; $select_opt= $extension_list;
} }
if ($child['type'] == 'SDD') { if ($child['type'] == 'SDD') {
if (empty($device_list)) {
$device_list = \FreePBX::Sccp_manager()->dbinterface->get_db_SccpTableData("SccpDevice");
$device_list[]=array(name=>'NONE', description=>'No Device');
}
$select_opt = $device_list; $select_opt = $device_list;
} }