nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Domain settings array override default settings

Browse Source 
Domain setting array types override the default settings set as type
This commit is contained in:
FusionPBX
2024-07-04 18:05:37 -06:00
committed by GitHub
parent 0ff2503240
commit 56aea7c66d
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/classes/settings.php
View File

@@ -261,6 +261,17 @@ class settings {
$result = $this->database->select($sql, $parameters, 'all');
unset($sql, $parameters);
if (!empty($result)) {
//domain setting array types override the default settings set as type array
foreach ($result as $row) {
$name = $row['domain_setting_name'];
$category = $row['domain_setting_category'];
$subcategory = $row['domain_setting_subcategory'];
if ($name == "array") {
$this->settings[$category][$subcategory] = array();
}
}
//add the domain settings to the $this->settings array
foreach ($result as $row) {
$name = $row['domain_setting_name'];
$category = $row['domain_setting_category'];
@@ -268,7 +279,7 @@ class settings {
if (empty($subcategory)) {
if ($name == "array") {
if (!isset($this->settings[$category]) || !is_array($this->settings[$category])) {
$this->settings[$category] = array();
$this->settings[$category] = array();
}
$this->settings[$category][] = $row['domain_setting_value'];
}
@@ -279,7 +290,7 @@ class settings {
else {
if ($name == "array") {
if (!isset($this->settings[$category][$subcategory]) || !is_array($this->settings[$category][$subcategory])) {
$this->settings[$category][$subcategory] = array();
$this->settings[$category][$subcategory] = array();
}
$this->settings[$category][$subcategory][] = $row['domain_setting_value'];
}