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

Update domains.php (#5092)

Browse Source 
* Update domains.php
This commit is contained in:
agree
2020-03-11 20:04:41 -06:00
committed by GitHub
parent 4d7d6918b0
commit 51a6b56dae
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/domains/domains.php
+1
View File
@@ -61,6 +61,7 @@
//update the domain session variables //update the domain session variables
$domain_uuid = $_GET["domain_uuid"]; $domain_uuid = $_GET["domain_uuid"];
$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
$_SESSION['domain_uuid'] = $domain_uuid; $_SESSION['domain_uuid'] = $domain_uuid;
$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name']; $_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name']; $_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'];
resources/classes/domains.php
+22 -1
View File
@@ -443,6 +443,28 @@ if (!class_exists('domains')) {
//set the PDO error mode //set the PDO error mode
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
//get previous domains settings
if (strlen($_SESSION["previous_domain_uuid"]) > 0) {
$sql = "select * from v_domain_settings ";
$sql .= "where domain_uuid = '" . $_SESSION["previous_domain_uuid"] . "' ";
$sql .= "and domain_setting_enabled = 'true' ";
try {
$prep_statement = $this->db->prepare($sql . " order by domain_setting_order asc ");
$prep_statement->execute();
}
catch(PDOException $e) {
$prep_statement = $this->db->prepare($sql);
$prep_statement->execute();
}
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
//unset previous domain settings
foreach ($result as $row) {
unset($_SESSION[$row['domain_setting_category']]);
}
unset($_SESSION["previous_domain_uuid"]);
}
//get the default settings //get the default settings
$sql = "select * from v_default_settings "; $sql = "select * from v_default_settings ";
try { try {
@@ -534,7 +556,6 @@ if (!class_exists('domains')) {
} }
} }
} }
//get the user settings //get the user settings
if (array_key_exists("domain_uuid",$_SESSION) and array_key_exists("user_uuid",$_SESSION) and strlen($_SESSION["domain_uuid"]) > 0 && strlen($_SESSION["user_uuid"]) > 0) { if (array_key_exists("domain_uuid",$_SESSION) and array_key_exists("user_uuid",$_SESSION) and strlen($_SESSION["domain_uuid"]) > 0 && strlen($_SESSION["user_uuid"]) > 0) {
$sql = "select * from v_user_settings "; $sql = "select * from v_user_settings ";