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

Correct handling of device vendor settings

Browse source 
Prefix was incorrect following removal of _column names
This commit is contained in:
steve-lad 2021-08-08 09:56:04 +02:00
parent 8dc1175b37
commit 481c8929a9
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sccpManTraits/ajaxHelper.php
View file

@ -691,7 +691,7 @@ trait ajaxHelper {
function saveSccpDevice($get_settings, $validateonly = false) { function saveSccpDevice($get_settings, $validateonly = false) {
$hdr_prefix = 'sccp_hw_'; $hdr_prefix = 'sccp_hw_';
$hdr_arprefix = 'sccp_hw-ar_'; $hdr_arprefix = 'sccp_hw-ar_';
$hdr_vendPrefix = 'sccp_hw_vendorconfig'; $hdr_vendPrefix = 'vendorconfig_';
$save_buttons = array(); $save_buttons = array();
$save_settings = array(); $save_settings = array();
@ -711,8 +711,9 @@ trait ajaxHelper {
$hw_prefix = 'VG'; $hw_prefix = 'VG';
} }
} }
foreach ($db_field as $data) { dbug($get_settings);
$key = (string) $data['Field']; dbug($db_field);
foreach ($db_field as $key) {
$value = ""; $value = "";
switch ($key) { switch ($key) {
case 'name': case 'name':
@ -792,15 +793,13 @@ trait ajaxHelper {
// Now only have normal prefix // Now only have normal prefix
if (!empty($get_settings["{$hdr_prefix}{$key}"])) { if (!empty($get_settings["{$hdr_prefix}{$key}"])) {
$value = $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)) { if (!empty($value)) {
$save_settings[$key] = $value; $save_settings[$key] = $value;
} }
} }
dbug($save_settings);
// Save this device. // Save this device.
$this->dbinterface->write('sccpdevice', $save_settings, 'replace'); $this->dbinterface->write('sccpdevice', $save_settings, 'replace');
// Retrieve the phone buttons from $_REQUEST ($get_settings) and write back to // Retrieve the phone buttons from $_REQUEST ($get_settings) and write back to