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

Cleaning up

Browse source 
Simplify structure and fix errors
This commit is contained in:
steve-lad 2021-02-07 16:09:35 +01:00 committed by Diederik de Groot
parent a1c020c772
commit fd8c5f9f96
No known key found for this signature in database
GPG key ID: AFA728250A1BECD6
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Sccp_manager.inc/dbinterface.class.php
View file

@ -45,6 +45,7 @@ class dbinterface
public function HWextension_db_SccpTableData($dataid, $data = array()) public function HWextension_db_SccpTableData($dataid, $data = array())
{ {
// $stmt is a single row fetch, $stmts is a fetchAll.
global $db; global $db;
$stmt = ''; $stmt = '';
$stmts = ''; $stmts = '';
@ -59,7 +60,7 @@ class dbinterface
$stmts = $db->prepare('SELECT * FROM sccpline WHERE name = $data[name]'); $stmts = $db->prepare('SELECT * FROM sccpline WHERE name = $data[name]');
} }
break; break;
case "SccpDevice": case 'SccpDevice':
$filtered =''; $filtered ='';
$singlerow = false; $singlerow = false;
if (empty($data['fields'])) { if (empty($data['fields'])) {
@ -112,11 +113,11 @@ class dbinterface
case 'HWextension': case 'HWextension':
$raw_settings = $this->getDb_model_info($get = "extension", $format_list = "model"); $raw_settings = $this->getDb_model_info($get = "extension", $format_list = "model");
break; break;
case "get_colums_sccpdevice": case 'get_colums_sccpdevice':
$sql = "DESCRIBE sccpdevice"; $sql = "DESCRIBE sccpdevice";
$stmt = $db->prepare($sql); $stmt = $db->prepare($sql);
break; break;
case "get_colums_sccpuser": case 'get_colums_sccpuser':
$sql = "DESCRIBE sccpuser"; $sql = "DESCRIBE sccpuser";
$stmts = $db->prepare($sql); $stmts = $db->prepare($sql);
break; break;
@ -127,7 +128,7 @@ class dbinterface
. 'LEFT JOIN sccpdevmodel as addon ON t1.addon=addon.model WHERE name="' . $data['id'] . ''; . 'LEFT JOIN sccpdevmodel as addon ON t1.addon=addon.model WHERE name="' . $data['id'] . '';
$stmt = $db->prepare($sql); $stmt = $db->prepare($sql);
break; break;
case "get_sccpuser": case 'get_sccpuser':
$sql = 'SELECT * FROM sccpuser '; $sql = 'SELECT * FROM sccpuser ';
if (!empty($data['id'])) { if (!empty($data['id'])) {
$sql .= 'WHERE name= ' . $data['id'] . ''; $sql .= 'WHERE name= ' . $data['id'] . '';
@ -199,7 +200,7 @@ class dbinterface
if (strpos($filter['model'], 'loadInformation')) { if (strpos($filter['model'], 'loadInformation')) {
$sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (loadinformationid =' . $filter['model'] . ') ORDER BY model'; $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (loadinformationid =' . $filter['model'] . ') ORDER BY model';
} else { } else {
$sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (loadinformationid =loadInformation' . $filter['model'] . ') ORDER BY model'; $sql = 'SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (loadinformationid = loadInformation' . $filter['model'] . ') ORDER BY model';
} }
} else { } else {
// $sql = "SELECT ".$filter['model']; // $sql = "SELECT ".$filter['model'];
@ -320,29 +321,27 @@ class dbinterface
$result = $db->prepare($req)->execute(); $result = $db->prepare($req)->execute();
break; break;
case 'sccpbuttons': case 'sccpbuttons':
if (($mode == 'clear') || ($mode == 'delete')) { switch ($mode) {
case 'clear': // no break here as clear is same as delete
case 'delete':
$sql = 'DELETE FROM sccpbuttonconfig WHERE ref=' . $hwid . ''; $sql = 'DELETE FROM sccpbuttonconfig WHERE ref=' . $hwid . '';
$result = $db->prepare($sql)->execute(); $result = $db->prepare($sql)->execute();
}
if ($mode == 'delete') {
break; break;
} case 'replace':
if (empty($save_value)) { if (!empty($save_value)) {
break;
}
if ($mode == 'replace') {
$sql = 'UPDATE sccpbuttonconfig SET `name`=? WHERE `ref`= ? AND `reftype`=? AND `instance`=? AND `buttontype`=?'; $sql = 'UPDATE sccpbuttonconfig SET `name`=? WHERE `ref`= ? AND `reftype`=? AND `instance`=? AND `buttontype`=?';
// $sql = 'INSERT INTO `sccpbuttonconfig` (`ref`, `reftype`,`instance`, `buttontype`, `name`, `options`) VALUES (?,?,?,?,?,?);';
// die(print_r($save_value,1));
$stmt = $db->prepare($sql); $stmt = $db->prepare($sql);
$result= $db->executeMultiple($stmt, $save_value); $result= $db->executeMultiple($stmt, $save_value);
} else { }
break;
default:
if (!empty($save_value)) {
$sql = 'INSERT INTO sccpbuttonconfig (`ref`, `reftype`,`instance`, `buttontype`, `name`, `options`) VALUES (?,?,?,?,?,?)'; $sql = 'INSERT INTO sccpbuttonconfig (`ref`, `reftype`,`instance`, `buttontype`, `name`, `options`) VALUES (?,?,?,?,?,?)';
// die(print_r($save_value,1));
$stmt = $db->prepare($sql); $stmt = $db->prepare($sql);
$result = $db->executeMultiple($stmt, $save_value); $result = $db->executeMultiple($stmt, $save_value);
} }
} }
}
return $result; return $result;
} }