From 65ec8133df1421737604a4d308fb2e3a56044581 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Tue, 11 Jul 2023 17:20:49 -0600
Subject: [PATCH] Update domains array when switching between tenants.

---
 core/domains/domains.php | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/core/domains/domains.php b/core/domains/domains.php
index b50ce82685..132caf33ce 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -38,31 +38,25 @@
 //change the domain
 	if (!empty($_GET["domain_uuid"]) && is_uuid($_GET["domain_uuid"]) && $_GET["domain_change"] == "true") {
 		if (permission_exists('domain_select')) {
-			//get the domain_uuid
-				$sql = "select * from v_domains ";
-				$sql .= "order by domain_name asc ";
-				$database = new database;
-				$result = $database->select($sql, null, 'all');
-				if (!empty($result)) {
-					foreach($result as $row) {
-						if (count($result) == 0) {
-							$_SESSION["domain_uuid"] = $row["domain_uuid"];
-							$_SESSION["domain_name"] = $row['domain_name'];
-						}
-						else {
-							if (!empty($domain_array) && ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0])) {
-								$_SESSION["domain_uuid"] = $row["domain_uuid"];
-								$_SESSION["domain_name"] = $row['domain_name'];
-							}
-						}
-					}
-				}
-				unset($sql, $result);
 
 			//update the domain session variables
 				$domain_uuid = $_GET["domain_uuid"];
 				$_SESSION["previous_domain_uuid"] = $_SESSION['domain_uuid'];
 				$_SESSION['domain_uuid'] = $domain_uuid;
+
+			//get the domain details
+				$sql = "select * from v_domains ";
+				$sql .= "order by domain_name asc ";
+				$database = new database;
+				$domains = $database->select($sql, null, 'all');
+				if (!empty($domains)) {
+					foreach($domains as $row) {
+						$_SESSION['domains'][$row['domain_uuid']] = $row;
+					}
+				}
+				unset($sql, $result);
+
+			//update the domain session variables
 				$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
 				$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'] ?? null;
 				$_SESSION["context"] = $_SESSION["domain_name"];