From 473033257a3de4f783d12949d5f27bef59be29c2 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 7 Jun 2023 11:43:15 -0600 Subject: [PATCH] Exclude switch default settings. This category is causing errors and is not needed for this code. --- resources/classes/domains.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/classes/domains.php b/resources/classes/domains.php index c2a02a3e51..becc9c3af9 100644 --- a/resources/classes/domains.php +++ b/resources/classes/domains.php @@ -645,6 +645,7 @@ if (!class_exists('domains')) { //get the default settings $sql = "select * from v_default_settings "; $sql .= "where default_setting_enabled = 'true' "; + $sql .= "and default_setting_category <> 'switch' "; $database = new database; $database_default_settings = $database->select($sql, null, 'all'); unset($sql); @@ -683,6 +684,9 @@ if (!class_exists('domains')) { $category = $row['default_setting_category']; $subcategory = $row['default_setting_subcategory']; if (empty($subcategory)) { + if (!isset($_SESSION[$category])) { + $_SESSION[$category] = []; + } if ($name == "array") { $_SESSION[$category][] = $row['default_setting_value']; } @@ -691,12 +695,16 @@ if (!class_exists('domains')) { } } else { + if (!isset($_SESSION[$category])) { + $_SESSION[$category] = []; + } + if (!isset($_SESSION[$category][$subcategory])) { + $_SESSION[$category][$subcategory] = []; + } if ($name == "array") { $_SESSION[$category][$subcategory][] = $row['default_setting_value']; } else { - if (!array($_SESSION[$category])) { $_SESSION[$category] = []; } - if (!array($_SESSION[$category][$subcategory])) { $_SESSION[$category][$subcategory] = []; } $_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid']; $_SESSION[$category][$subcategory][$name] = $row['default_setting_value']; }