diff --git a/sccpManClasses/dbinterface.class.php b/sccpManClasses/dbinterface.class.php index ce76c3e..3730aea 100644 --- a/sccpManClasses/dbinterface.class.php +++ b/sccpManClasses/dbinterface.class.php @@ -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)) { diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php index 53f7a92..78a89d5 100644 --- a/sccpManTraits/ajaxHelper.php +++ b/sccpManTraits/ajaxHelper.php @@ -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;