Remove chan-sccp (null) defaults

This commit is contained in:
steve-lad 2021-08-13 08:05:41 +02:00
parent 1bea598588
commit 570171bce0

View file

@ -1122,7 +1122,8 @@ function cleanUpSccpSettings() {
unset($settingsFromDb[$key]); unset($settingsFromDb[$key]);
} }
} else { } else {
($sysConfiguration[$key]['DefaultValue'] == '(null)') ? '' : $sysConfiguration[$key]['DefaultValue']; dbug($sysConfiguration);
$sysConfiguration[$key]['DefaultValue'] = ($sysConfiguration[$key]['DefaultValue'] == '(null)') ? '' : $sysConfiguration[$key]['DefaultValue'];
if (array_key_exists($key,$settingsFromDb)) { if (array_key_exists($key,$settingsFromDb)) {
// Preserve sequence and type // Preserve sequence and type
$settingsFromDb[$key]['systemdefault'] = $sysConfiguration[$key]['DefaultValue']; $settingsFromDb[$key]['systemdefault'] = $sysConfiguration[$key]['DefaultValue'];
@ -1130,6 +1131,7 @@ function cleanUpSccpSettings() {
$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']);
} }
} }
dbug($settingsFromDb);
// Override certain chan-sccp defaults as they are based on a non-FreePbx system // Override certain chan-sccp defaults as they are based on a non-FreePbx system
$settingsFromDb['context']['systemdefault'] = 'from-internal'; $settingsFromDb['context']['systemdefault'] = 'from-internal';
$settingsFromDb['directed_pickup']['systemdefault'] = 'no'; $settingsFromDb['directed_pickup']['systemdefault'] = 'no';