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

add systemdefault field to sccpvalues for savesccpsettings

Browse source
This commit is contained in:
steve-lad 2021-06-28 13:02:24 +02:00
parent 22d845ced3
commit d1e72714af
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sccpManClasses/dbinterface.class.php
View file

@ -161,7 +161,7 @@ class dbinterface
public function get_db_SccpSetting()
{
$dbh = \FreePBX::Database();
$stmt = $dbh->prepare('SELECT keyword, data, type, seq FROM sccpsettings ORDER BY type, seq');
$stmt = $dbh->prepare('SELECT keyword, seq, type, data, systemdefault FROM sccpsettings ORDER BY type, seq');
$stmt->execute();
foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $key => $rowArray) {
$settingsFromDb[$rowArray['keyword']] = $rowArray;
@ -247,11 +247,12 @@ class dbinterface
$result = false;
switch ($table_name) {
case 'sccpsettings':
dbug('savevalue', $save_value);
if ($mode == 'replace') { // Change mode name to be more transparent
$dbh->prepare('TRUNCATE sccpsettings')->execute();
$stmt = $dbh->prepare('INSERT INTO sccpsettings (keyword, data, seq, type, systemdefault) VALUES (:keyword,:data,:seq,:type,:systemdefault)');
} else {
$stmt = $dbh->prepare('REPLACE INTO sccpsettings (keyword, data, seq, type, systemdefault) VALUES (:keyword,:data,:seq,:type, :systemdefault)');
$stmt = $dbh->prepare('REPLACE INTO sccpsettings (keyword, data, seq, type, systemdefault) VALUES (:keyword,:data,:seq,:type,:systemdefault)');
}
foreach ($save_value as $key => $dataArr) {
if (empty($dataArr)) {

17
sccpManTraits/ajaxHelper.php
View file

@ -447,7 +447,8 @@ trait ajaxHelper {
'keyword' => $this->sccpvalues[$key]['keyword'],
'data' => $value,
'seq' => $this->sccpvalues[$key]['seq'],
'type' => $this->sccpvalues[$key]['type']
'type' => $this->sccpvalues[$key]['type'],
'systemdefault' => $this->sccpvalues[$key]['systemdefault']
);
}
}
@ -486,7 +487,8 @@ trait ajaxHelper {
'keyword' => $this->sccpvalues[$key]['keyword'],
'data' => $arr_data,
'seq' => $this->sccpvalues[$key]['seq'],
'type' => $this->sccpvalues[$key]['type']
'type' => $this->sccpvalues[$key]['type'],
'systemdefault' => $this->sccpvalues[$key]['systemdefault']
);
}
}
@ -500,9 +502,13 @@ trait ajaxHelper {
};
$tmpv = implode(";", $save_codec);
if ($tmpv !== $this->sccpvalues['allow']['data']) {
$save_settings[] = array('keyword' => 'allow', 'data' => $tmpv,
$save_settings[] = array(
'keyword' => 'allow',
'data' => $tmpv,
'seq' => $this->sccpvalues['allow']['seq'],
'type' => $this->sccpvalues['allow']['type']);
'type' => $this->sccpvalues['allow']['type'],
'systemdefault' => $this->sccpvalues['allow']['systemdefault']
);
}
break;
@ -515,7 +521,8 @@ trait ajaxHelper {
'keyword' => 'tzoffset',
'data' => $value,
'seq' => '98',
'type' => '2'
'type' => '2',
'systemdefault' => ''
);
}
break;