From 4a3f21dc5ddf5973811ef393104d425890821f87 Mon Sep 17 00:00:00 2001 From: steve-lad <72376554+steve-lad@users.noreply.github.com> Date: Mon, 8 Feb 2021 15:27:35 +0100 Subject: [PATCH] Further clean ups and annotations Document changes --- Sccp_manager.class.php | 20 +++------------ Sccp_manager.inc/dbinterface.class.php | 34 +++++++++++++------------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index 8926793..6f63211 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -869,7 +869,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } break; case 'getDeviceModel': -//dbug('getting Device model'); +dbug('getting Device model'); switch ($request['type']) { case 'all': case 'extension': @@ -930,7 +930,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { return $result; break; case 'getExtensionGrid': -//dbug('getting Extension Grid'); +dbug('getting Extension Grid'); $result = $this->dbinterface->HWextension_db_SccpTableData('SccpExtension'); if (empty($result)) { return array(); @@ -954,7 +954,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { return $result; break; case 'getPhoneGrid': -//dbug('getting Phone Grid'); +dbug('getting Phone Grid'); $cmd_type = !empty($request['type']) ? $request['type'] : ''; $result = $this->dbinterface->HWextension_db_SccpTableData('SccpDevice', array('type' => $cmd_type)); @@ -1868,22 +1868,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { // $save_settings = array(); if (empty($save_value)) { $this->dbinterface->write('sccpsettings', $this->sccpvalues, 'clear'); - -/* foreach ($this->sccpvalues as $key => $val) { - if ((trim($val['data']) !== '') or ($val['data'] == '0')) { - $save_settings[] = array($key, $val['data'], $val['seq'], $val['type']); - } else { - $unsaved_settings[] = array($key, $val['data'], $val['seq'], $val['type']); - } - } - $this->dbinterface->write('sccpsettings', $save_settings, 'clear'); -*/ } else { $this->dbinterface->write('sccpsettings', $save_value, 'update'); } return true; -// } -// return true; } /* @@ -2144,7 +2132,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $dir_list = $this->findAllFiles($dir, $file_ext, 'fileonly'); } $raw_settings = $this->dbinterface->getDb_model_info($get, $format_list, $filter); -//dbug('reloading table'); +dbug('reloading table'); if ($validate) { for ($i = 0; $i < count($raw_settings); $i++) { $raw_settings[$i]['validate'] = '-;-'; diff --git a/Sccp_manager.inc/dbinterface.class.php b/Sccp_manager.inc/dbinterface.class.php index a444506..7d908df 100644 --- a/Sccp_manager.inc/dbinterface.class.php +++ b/Sccp_manager.inc/dbinterface.class.php @@ -120,7 +120,7 @@ class dbinterface $sql = "DESCRIBE sccpuser"; $stmts = $db->prepare($sql); break; - case "get_sccpdevice_byid": + case 'get_sccpdevice_byid': $sql = 'SELECT t1.*, types.dns, types.buttons, types.loadimage, types.nametemplate as nametemplate, ' . 'addon.buttons as addon_buttons FROM sccpdevice AS t1 ' . 'LEFT JOIN sccpdevmodel as types ON t1.type=types.model ' @@ -191,7 +191,6 @@ class dbinterface if ($format_list === 'model') { $sel_inf = 'model, vendor, dns, buttons, 0 as validate'; } - $sel_inf .= ", '0' as 'validate'"; switch ($get) { case 'byciscoid': if (!empty($filter)) { @@ -219,31 +218,29 @@ class dbinterface break; } break; - case "extension": + case 'extension': $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (dns = 0) and (enabled > 0) ORDER BY model'; //check table break; - case "enabled": - $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE enabled > 0 ORDER BY model '; + case 'enabled': + $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE enabled > 0 ORDER BY model '; //previously this fell through to phones. break; - case "phones": + case 'phones': $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (dns > 0) and (enabled > 0) ORDER BY model '; //check table break; - case "ciscophones": + case 'ciscophones': $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (dns > 0) and (enabled > 0) AND vendor NOT LIKE \'%-sip\' ORDER BY model'; break; - case "sipphones": + case 'sipphones': $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (dns > 0) and (enabled > 0) AND `vendor` LIKE \'%-sip\' ORDER BY model'; break; - case "all": - $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel ORDER BY model'; - break; + case 'all': // Fall through to default default: $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel ORDER BY model'; break; } $stmt = $db->prepare($sql); $stmt->execute(); - return $stmt->fetchAll(); + return $stmt->fetchAll(\PDO::FETCH_ASSOC); } function write($table_name = "", $save_value = array(), $mode = 'update', $key_fld = "", $hwid = "") @@ -311,7 +308,7 @@ class dbinterface $req = 'DELETE FROM sccpuser WHERE ' . $sql_key . ''; } else { if ($mode == 'update') { - $req = 'UPDATE sccpuser SET ' . $sql_var . WHERE . $sql_key . ''; + $req = 'UPDATE sccpuser SET ' . $sql_var . 'WHERE ' . $sql_key . ''; } else { $req = 'REPLACE INTO sccpuser SET ' . $sql_var . ''; } @@ -363,11 +360,15 @@ class dbinterface public function validate() { global $db; - $result = false; - $check_fields = array('430' => array('_hwlang' => "varchar(12)"), '431' => array('private'=> "enum('on','off')"), '433' => array('directed_pickup'=>'') ); + $result = 0; + $check_fields = [ + '430' => ['_hwlang' => "varchar(12)"], + '431' => ['private'=> "enum('on','off')"], + '433' => ['directed_pickup'=>''] + ]; $stmt = $db->prepare('DESCRIBE sccpdevice'); $stmt->execute(); - foreach ($stmt->fetchAll() as $value) { + foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $value) { $id_result[$value['Field']] = $value['Type']; } foreach ($check_fields as $key => $value) { @@ -382,7 +383,6 @@ class dbinterface } } } - return $result; } }