diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index 1d3b1d5..5ec82c9 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -554,12 +554,11 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } break; default: - if (!empty($get_settings[$hdr_prefix . $key])) { - $value = $get_settings[$hdr_prefix . $key]; - } + // handle vendor prefix if (!empty($get_settings[$hdr_vendPrefix . $key])) { $value = $get_settings[$hdr_vendPrefix . $key]; } + // handle array prefix if (!empty($get_settings[$hdr_arprefix . $key])) { $arr_data = ''; $arr_clear = false; @@ -602,6 +601,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $value = $arr_data; } } + // Now only have normal prefix + if (!empty($get_settings["{$hdr_prefix}{$key}"])) { + $value = $get_settings["{$hdr_prefix}{$key}"]; + } else if (!empty($get_settings["sccp_hw{$key}"])) { + //have an underscore db field + $value = $get_settings["sccp_hw{$key}"]; + } } if (!empty($value)) { $save_settings[$key] = $value; diff --git a/Technical.notes/SEP0000000000.cnf.xml_annotated b/Technical.notes/SEP0000000000.cnf.xml_annotated index fa5a73f..1b0401f 100644 --- a/Technical.notes/SEP0000000000.cnf.xml_annotated +++ b/Technical.notes/SEP0000000000.cnf.xml_annotated @@ -95,98 +95,98 @@ true 2 - + - 1 - false false 0 - + 1 - + 0 - + --> + 0 - - 1 - - + 0 - - 0 + + 0 - + 1,7 08:00 12:00 @@ -200,52 +200,52 @@ - + - + - + - + 1 - + 2 @@ -256,10 +256,10 @@ 1 1 - - + 0 22 0 0 @@ -300,11 +300,11 @@ @@ -331,7 +331,7 @@ --> @@ -420,10 +420,10 @@ {Jan 01 2003 00:00:00} P00308010100 - http://x.x.x.x/cisco_menu/idle.php 3600 1 1 + 1 1 false 1 1 - 1 + 1 @@ -488,7 +494,7 @@ *84 *85 - + 104 0 184 @@ -508,7 +514,7 @@ 1 = Use ServicerURL / DirectoryURL and MessagesURL (Above) 2 = Use Both (Merge Both) --> - +