dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the menu and labels when switching domains in certain circumstances

This commit is contained in:
Mark Crane 2014-06-10 20:04:14 +00:00
parent 4c6b5e6b76
commit 299d2081f4
2 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/domain_settings/domains.php
View File

@ -71,10 +71,10 @@ else {
$_SESSION['domain_uuid'] = $domain_uuid;
$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'];
//clear the menu session so that it is regenerated for the selected domain
$_SESSION["menu"] = '';
//clear the extension array so that it is regenerated for the selected domain
unset($_SESSION['extension_array']);
//set the setting arrays
$domain = new domains();
$domain->db = $db;

4
resources/classes/domains.php
View File

@ -82,6 +82,7 @@
$name = $row['domain_setting_name'];
$category = $row['domain_setting_category'];
$subcategory = $row['domain_setting_subcategory'];
if (strlen($row['domain_setting_value']) > 0) {
if (strlen($subcategory) == 0) {
//$$category[$name] = $row['domain_setting_value'];
if ($name == "array") {
@ -100,6 +101,7 @@
}
}
}
}
//get the user settings
if (strlen($_SESSION["user_uuid"]) > 0) {
@ -115,6 +117,7 @@
$name = $row['user_setting_name'];
$category = $row['user_setting_category'];
$subcategory = $row['user_setting_subcategory'];
if (strlen($row['user_setting_value']) > 0) {
if (strlen($subcategory) == 0) {
//$$category[$name] = $row['domain_setting_value'];
if ($name == "array") {
@ -135,6 +138,7 @@
}
}
}
}
//set the values from the session variables
if (strlen($_SESSION['domain']['time_zone']['name']) > 0) {