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

Refinements to installer handling of sccpvalues

Browse source
This commit is contained in:
steve-lad 2021-08-10 11:52:17 +02:00
parent c209932eb5
commit 43677651df
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
install.php
View file

@ -1101,7 +1101,7 @@ function cleanUpSccpSettings() {
foreach ($sysConfiguration as $key => $valueArray) { foreach ($sysConfiguration as $key => $valueArray) {
// 2 special cases deny|permit & disallow|allow where need to parse on |. // 2 special cases deny|permit & disallow|allow where need to parse on |.
$newKeyword = explode("|", $valueArray['Name'], 2); $newKeyword = explode("|", $key, 2);
if (isset($newKeyword[1])) { if (isset($newKeyword[1])) {
// chan-sccp sets sysdef as comma separated list for sccp.conf, but expects ; separated list // chan-sccp sets sysdef as comma separated list for sccp.conf, but expects ; separated list
// when returned from db // when returned from db
@ -1124,10 +1124,8 @@ function cleanUpSccpSettings() {
} else { } else {
($sysConfiguration[$key]['DefaultValue'] == '(null)') ? '' : $sysConfiguration[$key]['DefaultValue']; ($sysConfiguration[$key]['DefaultValue'] == '(null)') ? '' : $sysConfiguration[$key]['DefaultValue'];
if (array_key_exists($key,$settingsFromDb)) { if (array_key_exists($key,$settingsFromDb)) {
if (!empty($sysConfiguration[$key2]['DefaultValue'])) { // Preserve sequence and type
// Preserve sequence and type $settingsFromDb[$key]['systemdefault'] = $sysConfiguration[$key]['DefaultValue'];
$settingsFromDb[$key]['systemdefault'] = $sysConfiguration[$key]['DefaultValue'];
}
} else { } else {
$settingsFromDb[$key] = array('keyword' => $key, 'seq' => 0, 'type' => 0, 'data' => '', 'systemdefault' => $sysConfiguration[$key]['DefaultValue']); $settingsFromDb[$key] = array('keyword' => $key, 'seq' => 0, 'type' => 0, 'data' => '', 'systemdefault' => $sysConfiguration[$key]['DefaultValue']);
} }