diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433 index 583c421..443187a 100644 --- a/conf/sccpgeneral.xml.v433 +++ b/conf/sccpgeneral.xml.v433 @@ -218,7 +218,7 @@ and open the template in the editor. Base Version before all crash :-) ccm_address Internal - 0.0.0.0/2000 + 0.0.0.0:2000 diff --git a/module.xml b/module.xml index 33f9036..28e6e6d 100644 --- a/module.xml +++ b/module.xml @@ -1,7 +1,7 @@ sccp_manager SCCP Manager - 14.3.0.1 + 14.3.0.0 setup SCCP Connectivity Steve Lad, Alex GP diff --git a/sccpManClasses/formcreate.class.php b/sccpManClasses/formcreate.class.php index fc86a9a..0652bdd 100644 --- a/sccpManClasses/formcreate.class.php +++ b/sccpManClasses/formcreate.class.php @@ -213,7 +213,6 @@ class formcreate } if (empty($res_value)) { $res_value = array((string) $child->default); - // $res_value = explode('/', (string) $child->default); } ?>
@@ -280,17 +279,19 @@ class formcreate ?>
> xpath('input') as $value) { $res_n = $res_id.'['.$i.']['.$value['field'].']'; $fields_id = (string)$value['field']; - $opt_at[$fields_id]['nameseparator']=(string)$value['nameseparator']; + //$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']; - + //$opt_at[$fields_id]['nameseparator']=(string)$value['nameseparator']; + if (!empty((string)$value['nameseparator'])) { + $res_vf = explode((string)$value['nameseparator'], $dat_v); + } echo 'options)) { foreach ($value->options ->attributes() as $optkey => $optval) { diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php index dbe8515..6dcba53 100644 --- a/sccpManTraits/ajaxHelper.php +++ b/sccpManTraits/ajaxHelper.php @@ -415,6 +415,7 @@ trait ajaxHelper { } function handleSubmit($request, $validateonly = false) { + dbug($request); $hdr_prefix = 'sccp_'; $hdr_arprefix = 'sccp-ar_'; $save_settings = array(); @@ -477,29 +478,27 @@ trait ajaxHelper { $arr_data = ''; if (!empty($this->sccpvalues[$key])) { foreach ($value as $vkey => $vval) { - $tmp_data = ''; + //$tmp_data = ''; foreach ($vval as $vkey => $vval) { switch ($vkey) { case 'inherit': case 'internal': if ($vval == 'on') { - $tmp_data .= 'internal;'; + $arr_data .= 'internal;'; } break; + case 'port': + $arr_data .= ":{$vval}"; + break; + case 'mask': + $arr_data .= "/{$vval}"; + break; default: - $tmp_data .= $vval . '/'; + $arr_data .= $vval; break; } } - if (strlen($tmp_data) > 2) { - while (substr($tmp_data, -1) == '/') { - $tmp_data = substr($tmp_data, 0, -1); - } - $arr_data .= $tmp_data . ';'; - } - } - while (substr($arr_data, -1) == ';') { - $arr_data = substr($arr_data, 0, -1); + //$arr_data .= $tmp_data; } if (!($this->sccpvalues[$key]['data'] == $arr_data)) { $save_settings[$key] = array(