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

Merge 7183c01a22 into 5752d9f393

Browse source
This commit is contained in:
John Volk 2023-08-15 00:13:09 +00:00 committed by GitHub
parent 5752d9f393 7183c01a22
commit a59b2b1e2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Sccp_manager.class.php
View file

@ -95,6 +95,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
private $cnf_wr = null;
public $sccppath = array();
public $sccpvalues = array();
private $dbsccpvalues = array();
public $sccp_conf_init = array();
public $xml_data;
public $class_error; //error construct
@ -136,6 +137,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
}
$this->sccpvalues = $this->dbinterface->get_db_SccpSetting(); //Initialise core settings
$this->dbsccpvalues = $this->sccpvalues; //Copy settings from DB for future reference
$this->initializeSccpPath(); //Set required Paths
$this->updateTimeZone(); // Get timezone from FreePBX
//$this->findInstLangs();
@ -800,9 +802,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
*/
private function saveSccpSettings($save_value = array()) {
$diffToSave = array_udiff_assoc($this->sccpvalues, $this->dbsccpvalues, array($this, "compareArrays"));
if (empty($save_value)) {
$this->dbinterface->write('sccpsettings', $this->sccpvalues, 'replace'); //Change to replace as clearer
$this->dbinterface->write('sccpsettings', $diffToSave, 'update');
} else {
$this->dbinterface->write('sccpsettings', $save_value, 'update');
}

8
sccpManTraits/helperFunctions.php
View file

@ -288,7 +288,13 @@ trait helperfunctions {
return $sccp_conf_init;
}
public function compareArrays(array $a, array $b){
if (array_diff_assoc($a, $b)===[]) {
return 0;
}
return ($a>$b)?1:-1;
}
public function checkTftpMapping(){
exec('in.tftpd -V', $tftpInfo);
$info['TFTP Server'] = array('Version' => 'Not Found', 'about' => 'Mapping not available');