From 71fef35ebd0e80d93a7ccbf33e35233b9816e7be Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Sat, 10 Jul 2021 10:45:42 +0200 Subject: [PATCH] Finalise FormShowSysDefs Remove debug conditionals in Sccp_manager Pass missing arguments for tftpLang Remove unused items from sccpgeneral.xml --- Sccp_manager.class.php | 41 +- conf/sccpgeneral.xml.v433 | 12 +- sccpManClasses/formcreate.class.php | 27 +- views/formShow.php | 981 ---------------------------- views/formShowSysDefs.php | 5 +- 5 files changed, 32 insertions(+), 1034 deletions(-) delete mode 100644 views/formShow.php diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index 708e4d8..e864608 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -168,37 +168,16 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if ((array) $this->xml_data) { foreach ($this->xml_data->xpath('//page_group[@name="' . $group_name . '"]') as $item) { - // TODO: Clean up below after debug - if (($group_name == 'sccp_general') || ($group_name == 'sccp_qos_config') || - ($group_name =='sccp_dev_config') || ($group_name =='sccp_dev_group_config') || - ($group_name =='sccp_hotline_config') || ($group_name =='sccp_dev_softkey') || - ($group_name =='sccp_dev_advconfig') || ($group_name == 'sccp_extpath_config') || - ($group_name =='sccp_dev_vendor_conf') || ($group_name =='sccp_hw_dev_softkey') || - ($group_name =='sccp_hw_dev_advance') || ($group_name =='sccp_hw_dev_conference') || - ($group_name =='sccp_hw_dev_network') || ($group_name == 'sccp_hw_dev_edit') + $htmlret = load_view(__DIR__ . '/views/formShowSysDefs.php', array( + 'itm' => $item, + 'h_show' => $show_Header, + 'form_prefix' => $form_prefix, + 'fvalues' => $form_values, + 'tftpLang' => $this->tftpLang, + 'chanSccpHelp' => $this->sccpHelpInfo, + 'sccp_defaults' => $this->sccpvalues ) - { - $htmlret = load_view(__DIR__ . '/views/formShowSysDefs.php', array( - 'itm' => $item, - 'h_show' => $show_Header, - 'form_prefix' => $form_prefix, - 'fvalues' => $form_values, - 'tftp_lang' => $this->tftpLang, - 'chanSccpHelp' => $this->sccpHelpInfo, - 'sccp_defaults' => $this->sccpvalues - )); - } else { - $htmlret = load_view(__DIR__ . '/views/formShow.php', array( - 'itm' => $item, - 'h_show' => $show_Header, - 'form_prefix' => $form_prefix, - 'fvalues' => $form_values, - 'tftp_lang' => $this->tftpLang, - 'chanSccpHelp' => $this->sccpHelpInfo, - 'sccp_defaults' => $this->sccpvalues - ) - ); - } + ); } } else { $htmlret = load_view(__DIR__ . '/views/formShowError.php'); @@ -775,7 +754,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { private function initTftpLang() { $result = array(); if (empty($this->sccppath["tftp_path"]) || empty($this->sccppath["tftp_lang_path"])) { - return; + return $result; } $dir = $this->sccppath["tftp_lang_path"]; diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433 index 50a11af..b96617c 100644 --- a/conf/sccpgeneral.xml.v433 +++ b/conf/sccpgeneral.xml.v433 @@ -1278,16 +1278,6 @@ and open the template in the editor. Base Version before all crash :-) The MAC address of the phone - - - type - 7911 - - - hw_select sccp-custom - The type of phone: 7911, 7940, 7960, etc. Important note: the 'G' models are handled as the base model (e.g., 7962G is handled as 7962). In the Display mode, this field is read-only because the MAC address and the model number are a pair. - - @@ -1346,7 +1336,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. diff --git a/sccpManClasses/formcreate.class.php b/sccpManClasses/formcreate.class.php index 190910b..c8cca0f 100644 --- a/sccpManClasses/formcreate.class.php +++ b/sccpManClasses/formcreate.class.php @@ -43,8 +43,14 @@ class formcreate -
"; + // Can have multiple inputs for a field which are displayed with a separator foreach ($child->xpath('input') as $value) { $res_n = (string)$value->name; @@ -114,6 +120,13 @@ class formcreate
buttonHelpLabel} value for {$shortId}"; ?>
+ + + +
"; + echo "
"; if (!empty($sccp_defaults[$res_n]['systemdefault']) && ($sccp_defaults[$res_n]['systemdefault'] != $res_v)) { $usingSysDefaults = false; @@ -549,7 +562,7 @@ class formcreate name; $res_id = $npref.$res_n; @@ -562,16 +575,14 @@ class formcreate } switch ($child['type']) { case 'SLS': + $syslangs = array(); if (\FreePBX::Modules()->checkStatus("soundlang")) { $syslangs = \FreePBX::Soundlang()->getLanguages(); - if (!is_array($syslangs)) { - $syslangs = array(); - } } $select_opt= $syslangs; break; case 'SLT': - $select_opt= $tftp_lang; + $select_opt= $tftpLang; break; case 'SLZ': $timeZoneOffsetList = array('-12' => 'GMT -12', '-11' => 'GMT -11', '-10' => 'GMT -10', '-09' => 'GMT -9', @@ -610,6 +621,7 @@ class formcreate $select_opt= $day_format; break; case 'SLK': + $softKeyList = array(); $softKeyList = \FreePBX::Sccp_manager()->aminterface->sccp_list_keysets(); $select_opt= $softKeyList; break; @@ -648,6 +660,7 @@ class formcreate
class . '" id="' . $res_id . '">'; + dbug('', $res_id); foreach ($select_opt as $key => $val) { if (is_array($val)) { $opt_key = (isset($val['id'])) ? $val['id'] : $key; diff --git a/views/formShow.php b/views/formShow.php deleted file mode 100644 index ed6288c..0000000 --- a/views/formShow.php +++ /dev/null @@ -1,981 +0,0 @@ - 'GMT -12', '-11' => 'GMT -11', '-10' => 'GMT -10', '-09' => 'GMT -9', - '-08' => 'GMT -8', '-07' => 'GMT -7', '-06' => 'GMT -6', '-05' => 'GMT -5', - '-04' => 'GMT -4', '-03' => 'GMT -3', '-02' => 'GMT -2', '-01' => 'GMT -1', - '00' => 'GMT', '01' => 'GMT +1', '02' => 'GMT +2', '03' => 'GMT +3', - '04' => 'GMT +4', '05' => 'GMT +5', '06' => 'GMT +6', '07' => 'GMT +7', - '08' => 'GMT +8', '09' => 'GMT +9', '10' => 'GMT +10', '11'=> 'GMT +11', '12' => 'GMT +12'); - -$extension_list = array(); -$sofkey_list = array(); -$model_list = array(); -$device_list = array(); -$dialplan_list = array(); - -if (\FreePBX::Modules()->checkStatus("soundlang")) { - $syslangs = \FreePBX::Soundlang()->getLanguages(); - if (!is_array($syslangs)) { - $syslangs = array(); - } -} -if (function_exists('music_list')) { - $moh_list = music_list(); -// $cur = (isset($mohsilence) && $mohsilence != "" ? $mohsilence : 'default'); -} -if (!is_array($moh_list)) { - $moh_list = array('default'); -} -if (empty($fvalues)) { - $fvalues = $sccp_defaults; -} - -$items = $itm -> children(); - -if ($h_show==1) { - $sec_class =''; - if (!empty($items ->class)) { - $sec_class = (string)$items ->class; - } - ?> - -
-

label) ?>

-
-
- - help)) { - $child->help = 'Help is not available.'; - $child->meta_help = '1'; - } -// $child->meta_help = '1'; // Remove comments to see original help ! - - if ($child['type'] == 'IE') { - $res_input = ''; - $res_name = ''; - $shortID = (string)$child->input[0]->name; - $res_id = $npref.$shortID; - if (!empty($metainfo[$shortID])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metainfo[$shortID]; - } - } - - // --- Add Hiden option - $res_sec_class =''; - if (!empty($child ->class)) { - $res_sec_class = (string)$child ->class; - } - - if (empty($child->nameseparator)) { - $child->nameseparator = ' / '; - } - $i = 0; - - echo ''; - - ?> -
-
-
- - -
-
- xpath('input') as $value) { - $res_n = (string)$value->name; - $res_name = $npref . $res_n; - if (empty($res_id)) { - $res_id = $res_name; - } - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $value->value = $fvalues[$res_n]['data']; - } - } - - if (empty($value->value)) { - $value->value = $value->default; - } - if (empty($value->type)) { - $value->type = 'text'; - } - if (empty($value->class)) { - $value->class = 'form-control'; - } - if ($i > 0) { - echo $child->nameseparator; - } -// - echo 'options)) { - foreach ($value->options ->attributes() as $optkey => $optval) { - echo ' '.$optkey.'="'.$optval.'"'; - } - } - if (!empty($value->min)) { - echo ' min="'.$value->min.'"'; - } - if (!empty($value->max)) { - echo ' max="'.$value->max.'"'; - } - echo '>'; - $i ++; - } - ?> -
-
-
- help);?> -
-
- - label.' -->'; - } - if ($child['type'] == 'IED') { - $res_input = ''; - $res_value = ''; - $opt_at = array(); - $res_n = (string)$child->name; - - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } -// $res_value - $lnhtm = ''; - $res_id = $napref.$child->name; - $i = 0; - $max_row = 255; - if (!empty($child->max_row)) { - $max_row = $child->max_row; - } - - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $res_value = explode(';', $fvalues[$res_n]['data']); - } - } - if (empty($res_value)) { - $res_value = array((string) $child->default); -// $res_value = explode('/', (string) $child->default); - } - - echo ''; - ?> -
-
-
-
-
-
- - -
- -
- cbutton)) { - echo '
'; - foreach ($child->xpath('cbutton') as $value) { - $res_n = $res_id.'[0]['.$value['field'].']'; - $res_vf = ''; - if ($value['value']=='NONE' && empty($res_value)) { - $res_vf = 'active'; - } - $ch_key = array_search($value['value'], $res_value); - if ($ch_key !== false) { - unset($res_value[$ch_key]); - $res_vf = 'active'; - $res_value = explode(';', implode(';', $res_value)); - } - $opt_hide =''; - $opt_class="button-checkbox"; - if (!empty($value->option_hide)) { - $opt_class .= " sccp_button_hide"; - $opt_hide = ' data-vhide="'.$value->option_hide.'" data-btn="checkbox" data-clhide="'.$value->option_hide['class'].'" '; - } - if (!empty($child->option_show)) { - if (empty($opt_hide)) { - $opt_hide =' class="sccp_button_hide" '; - } - $opt_hide .= ' data-vshow="'.$child->option_show.'" data-clshow="'.$child->option_show['class'].'" '; - } - - if (!empty($value->option_disabled)) { - $opt_class .= " sccp_button_disabled"; - $opt_hide = ' data-vhide="'.$value->option_disabled.'" data-btn="checkbox" data-clhide="'.$value->option_disabled['class'].'" '; - } - - if (!empty($value->class)) { - $opt_class .= " ".(string)$value->class; - } - - echo ''; - } - echo '
'; - } - $opt_class = "col-sm-7 ".$res_id."-gr"; - if (!empty($child->class)) { - $opt_class .= " ".(string)$child->class; - } - echo '
'; - - foreach ($res_value as $dat_v) { - ?> -
> - xpath('input') as $value) { - $res_n = $res_id.'['.$i.']['.$value['field'].']'; - $fields_id = (string)$value['field']; - $opt_at[$fields_id]['nameseparator']=(string)$value['nameseparator']; - if (!empty($value->class)) { - $opt_at[$fields_id]['class']='form-control ' .(string)$value->class; - } - $opt_at[$fields_id]['nameseparator']=(string)$value['nameseparator']; - - echo 'options)) { - foreach ($value->options ->attributes() as $optkey => $optval) { - $opt_at[$fields_id]['options'][$optkey]=(string)$optval; - echo ' '.$optkey.'="'.$optval.'"'; - } - } - echo '> '.(string)$value['nameseparator'].' '; - $i2 ++; - } - if (!empty($child->add_pluss)) { - echo ''; - } - echo '
'; - $i++; - } - ?> - -
- addbutton)) { - echo '
'; - echo ''; - echo '
'; - } - ?> -
-
-
-
-
-
- help);?> -
-
- label.' -->'; - } - - if ($child['type'] == 'IS') { - $res_n = (string)$child->name; - $res_id = $npref.$res_n; - $res_ext = str_replace($npref,'',$res_n); - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } - - // --- Add Hiden option - $res_sec_class =''; - if (!empty($child ->class)) { - $res_sec_class = (string)$child ->class; - } - - echo ''; - ?> -
-
-
- - -
-
- default)) { - $res_v = (string)$child->default; - } - if (!empty($child->value)) { - $res_v = (string)$child->value; - } - if (!empty($fvalues[$res_n])) { - if (($fvalues[$res_n]['data'] != '') ) { - $res_v = (string)$fvalues[$res_n]['data']; - } - } - if (!empty($child->option_hide)) { - $opt_hide = ' class="sccp_button_hide" data-vhide="'.$child->option_hide.'" data-clhide="'.$child->option_hide['class'].'" '; - } - if (!empty($child->option_show)) { - if (empty($opt_hide)) { - $opt_hide =' class="sccp_button_hide" '; - } - $opt_hide .= ' data-vshow="'.$child->option_show.'" data-clshow="'.$child->option_show['class'].'" '; - } - foreach ($child->xpath('button') as $value) { - $val_check = strtolower((string)$value[@value]); - if ($val_check == strtolower($res_v)) { - $val_check = " checked"; - } else { - if ($val_check == '' || $val_check == 'none' ) { - if (strtolower($res_v) == 'none' || $res_v == '' ) { - $val_check = " checked"; - } else {$val_check = "";} - } else {$val_check = "";} - } - echo ''; - echo ''; - $i++; - } - ?> -
-
-
- help);?> -
-
- - label.' -->'; - } - -/* - * Input element Select SLD - Date format - * SLZ - Time Zone - * - * SLM - Music on hold - * SLK - System KeySet - * SLP - Dial Paterns - */ - - if ($child['type'] == 'SLD' || $child['type'] == 'SLM'|| $child['type'] == 'SLK'|| $child['type'] == 'SLP') { -// $value = $child -> select; - $res_n = (string)$child ->name; - $res_id = $npref.$res_n; - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } - - if (empty($child->class)) { - $child->class = 'form-control'; - } - - if ($child['type'] == 'SLD') { - $select_opt= $day_format; - } - - if ($child['type'] == 'SLM') { - $select_opt= $moh_list; - } - if ($child['type'] == 'SLK') { - if (empty($sofkey_list)) { - $sofkey_list = \FreePBX::Sccp_manager()->aminterface->sccp_list_keysets(); - } - $select_opt= $sofkey_list; - } - if ($child['type'] == 'SLP') { - if (empty($dialplan_list)) { - foreach (\FreePBX::Sccp_manager()->getDialPlanList() as $tmpkey) { - $tmp_id = $tmpkey['id']; - $dialplan_list[$tmp_id] = $tmp_id; - } - } - $select_opt= $dialplan_list; - } -// if ($child['type'] == 'SLZ') { -// $select_opt= $timeZoneOffsetList; -// } - - echo ''; - - ?> -
-
- -
- - -
-
class . '" id="' . $res_id . '">'; - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $child->value = $fvalues[$res_n]['data']; - } - } - foreach ($select_opt as $key) { - echo ''; - } - ?> -
-
-
- help);?> -
-
- label.' -->'; - } -/* - * Input element Select SLS - System Language - */ - - if ($child['type'] == 'SLS' || $child['type'] == 'SLT' || $child['type'] == 'SLA' || $child['type'] == 'SLZ') { -// $value = $child -> select; - $res_n = (string)$child ->name; - $res_id = $npref.$res_n; - $child->value =''; - - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } - - if ($child['type'] == 'SLS') { - $select_opt= $syslangs; - } - if ($child['type'] == 'SLT') { - $select_opt= $tftp_lang; - } - if ($child['type'] == 'SLZ') { - $select_opt= $timeZoneOffsetList; -// $child->value = ($system_time_zone[offset]/60); - } - - if ($child['type'] == 'SLA') { - $select_opt =''; - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $res_value = explode(';', $fvalues[$res_n]['data']); - } - if (empty($res_value)) { - $res_value = array((string) $child->default); - } - foreach ($res_value as $key) { - $select_opt[$key]= $key; - } - } - } - - if (empty($child->class)) { - $child->class = 'form-control'; - } - - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $child->value = $fvalues[$res_n]['data']; - } - } - - if (empty($child->value)) { - if (!empty($child->default)) { - $child->value = $child->default; - } - } - - echo ''; - ?> -
-
- -
- - -
-
class . '" id="' . $res_id . '">'; - foreach ($select_opt as $key => $val) { - if (is_array($val)) { - $opt_key = (isset($val['id'])) ? $val['id'] : $key; - $opt_val = (isset($val['val'])) ? $val['val'] : $val; - } else { - $opt_key = $key; - $opt_val = $val; - } - echo ''; - } - ?> -
-
-
- help);?> -
-
- - label.' -->'; - } -/* - * Input element Select - */ - - if ($child['type'] == 'SL') { - $res_n = (string)$child->name; - $res_id = $npref.$child->name; - - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } - - if (empty($child ->class)) { - $child->class = 'form-control'; - } - echo ''; - - ?> -
-
- -
- - -
-
class . '" id="' . $res_id . '">'; - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $child->value = $fvalues[$res_n]['data']; - } - } - foreach ($child->xpath('select') as $value) { - if (!empty($value[@value])) { - $key = $value[@value]; - } else { - $key = (string)$value; - } - echo ''; - } - ?> - -
-
-
- help);?> -
-
- label.' -->'; - } - - /* - * Input element Select SDM - Model List - * SDMS - Sip model List - * SDE - Extension List - */ - - if ($child['type'] == 'SDM' || $child['type'] == 'SDMS' || $child['type'] == 'SDE' || $child['type'] == 'SDD') { -// $value = $child -> select; - $res_n = (string)$child ->name; - $res_id = $npref.$res_n; - - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } - - if (empty($child->class)) { - $child->class = 'form-control'; - } - if ($child['type'] == 'SDM') { - if (empty($model_list)) { - $model_list = \FreePBX::Sccp_manager()->dbinterface->getSccpDeviceTableData("HWDevice"); - } - $select_opt= $model_list; - } - if ($child['type'] == 'SDMS') { - if (empty($model_list)) { - $model_list = \FreePBX::Sccp_manager()->dbinterface->getSccpDeviceTableData("HWSipDevice"); - } - $select_opt= $model_list; - } - if ($child['type'] == 'SDE') { - if (empty($extension_list)) { - $extension_list = \FreePBX::Sccp_manager()->dbinterface->getSccpDeviceTableData("HWextension"); - $extension_list[]=array( 'model' => 'NONE', 'vendor' => 'CISCO', 'dns' => '0'); - foreach ($extension_list as &$data) { - $d_name = explode(';', $data['model']); - if (is_array($d_name) && (count($d_name) > 1)) { - $data['description'] = count($d_name).'x '.$d_name[0]; - } else { - $data['description'] = $data['model']; - } - } - unset($data); - } - $select_opt= $extension_list; - } - if ($child['type'] == 'SDD') { - if (empty($device_list)) { - $device_list = \FreePBX::Sccp_manager()->dbinterface->getSccpDeviceTableData("SccpDevice"); - $device_list[]=array('name' => 'NONE', 'description' => 'No Device'); - } - $select_opt = $device_list; - } - - echo ''; - - ?> -
-
- -
- - -
-
class . '" id="' . $res_id . '"'; - if (isset($child->options)) { - foreach ($child->options->attributes() as $optkey => $optval) { - echo ' '.$optkey.'="'.$optval.'"'; - } - } - echo '>'; - - $fld = (string)$child->select['name']; - $flv = (string)$child->select; - $flv2 = (string)$child->select['addlabel']; - $flk = (string)$child->select['dataid']; - $flkv = (string)$child->select['dataval']; - $key = (string)$child->default; - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $child->value = $fvalues[$res_n]['data']; - $key = $fvalues[$res_n]['data']; - } - } - - foreach ($select_opt as $data) { - echo ''; - } - - ?> -
-
-
- help);?> -
-
- label.' -->'; - } - if ($child['type'] == 'ITED') { - $res_input = ''; - $res_na = (string)$child->name; - -// $res_value - $lnhtm = ''; - $res_id = $napref.$child->name; - $i = 0; - - if (!empty($fvalues[$res_na])) { - if (!empty($fvalues[$res_na]['data'])) { - $res_value = explode(';', $fvalues[$res_na]['data']); - } - } - if (empty($res_value)) { - $res_value = array((string) $child->default); -// $res_value = explode('/', (string) $child->default); - } - - echo ''; - ?> - - - '; - if (!empty($child->label)) { - echo ''; - } - - $res_vf = explode('/', $dat_v); - $i2 = 0; - - foreach ($child->xpath('element') as $value) { - $fields_id = (string)strtolower($value['field']); - $res_n = $res_id.'['.$i.']['.$fields_id.']'; - $res_ni = $res_id.'_'.$i.'_'.$fields_id; - - $opt_at[$fields_id]['display_prefix']=(string)$value['display_prefix']; - $opt_at[$fields_id]['display_sufix']=(string)$value['display_sufix']; - - if (empty($value->options->class)) { - $opt_at[$fields_id]['options']['class']='form-control'; - } - $opt_at[$fields_id]['type']=(string)$value['type']; - $res_opt['addon'] =''; - if (isset($value->options)) { - foreach ($value->options ->attributes() as $optkey => $optval) { - $opt_at[$fields_id]['options'][$optkey]=(string)$optval; - $res_opt['addon'] .=' '.$optkey.'="'.$optval.'"'; - } - } - - echo ''; - $i2 ++; - } - echo ''; - $i++; - } - echo '
'.$child->label.'
'; - $res_opt['inp_st'] = '
'.$opt_at[$fields_id]['display_prefix'].''; - $res_opt['inp_end'] = ''.$opt_at[$fields_id]['display_sufix'].'
'; - switch ($value['type']) { - case 'date': - echo $res_opt['inp_st'].''.$res_opt['inp_end']; - break; - case 'number': - echo $res_opt['inp_st'].''.$res_opt['inp_end']; - break; - case 'input': - echo $res_opt['inp_st'].''.$res_opt['inp_end']; - break; - case 'title': - if ($i > 0) { - break; - } - case 'label': - $opt_at[$fields_id]['data'] = (string)$value; - echo ''; - break; - case 'select': - echo $res_opt['inp_st'].''.$res_opt['inp_end']; - break; - } - echo '
'; - if ($i > 0) { - echo ''; - } - - echo '
'; - echo ''; - } - - if ($child['type'] == 'HLP') { - $res_n = (string)$child ->name; - $res_id = $npref.$res_n; - if (empty($child->class)) { - $child->class = 'form-control'; - } - echo ''; - - ?> - -
-
-

label);?> -

-
-
- xpath('element') as $value) { - switch ($value['type']) { - case 'p': - case 'h1': - case 'h2': - case 'h3': - case 'h4': - echo '<'.$value['type'].'>'._((string)$value).''; - break; - case 'table': - echo '<'.$value['type'].' class="table" >'; - foreach ($value->xpath('row') as $trow) { - echo ''; - foreach ($trow->xpath('col') as $tcol) { - echo ''._((string)$tcol).''; - } - echo ''; - } - echo ''; - break; - } - } - ?> - -
-
- label.' -->'; - } - if ($child['type'] == 'MINFO') { - $res_n = (string)$child ->name; - $res_id = $npref.$res_n; - if (empty($child->class)) { - $child->class = 'form-control'; - } - echo ''; - ?> - - label.' -->'; - } -/* - * Input element Select SLTZN - System Time Zone - */ - - if ($child['type'] == 'SLTZN') { -// $value = $child -> select; - $res_n = (string)$child ->name; - $res_id = $npref.$res_n; - $child->value =''; - - if (!empty($metainfo[$res_n])) { - if ($child->meta_help == '1' || $child->help == 'Help!') { - $child->help = $metaInfo[$res_n]; - } - } - - if (empty($child->class)) { - $child->class = 'form-control'; - } - - if (!empty($fvalues[$res_n])) { - if (!empty($fvalues[$res_n]['data'])) { - $child->value = $fvalues[$res_n]['data']; - } - } - - $child->value = \date_default_timezone_get(); - - echo ''; - ?> -
-
-
-
- - -
-
value; - ?> -
-
-
-
- help);?> -
-
- - label.' -->'; - } -} -?> -'; -} -?> diff --git a/views/formShowSysDefs.php b/views/formShowSysDefs.php index 1ae0e60..fa2245e 100644 --- a/views/formShowSysDefs.php +++ b/views/formShowSysDefs.php @@ -55,7 +55,6 @@ foreach ($items as $child) { $child->meta_help = '1'; } echo ""; -// $child->meta_help = '1'; // Remove comments to see chan-sccp supplied help ! switch ($child['type']) { case 'IE': \FreePbx::sccp_manager()->formcreate->addElementIE($child, $fvalues, $sccp_defaults,$npref); @@ -70,14 +69,12 @@ foreach ($items as $child) { case 'SLM': case 'SLK': case 'SLP': - //$this->formcreate->addElementSL($child, $fvalues, $sccp_defaults,$npref); - //break; case 'SLS': case 'SLT': case 'SLA': case 'SLZ': case 'SL': - \FreePbx::sccp_manager()->formcreate->addElementSL2($child, $fvalues, $sccp_defaults,$npref); + \FreePbx::sccp_manager()->formcreate->addElementSL2($child, $fvalues, $sccp_defaults,$npref, $tftpLang); break; case 'SDM': case 'SDMS':