From 608480b8aff31705d10b6da576f6927bdd871345 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 16 Oct 2025 08:15:16 -0600
Subject: [PATCH] Update the cache key

---
 app/basic_operator_panel/index.php                  |  2 +-
 app/gateways/resources/classes/gateways.php         |  8 ++------
 app/sip_profiles/resources/classes/sip_profiles.php | 10 ++++------
 app/sip_profiles/sip_profile_edit.php               |  2 +-
 resources/switch.php                                |  6 ++----
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php
index 19c488d109..76b0aa1943 100644
--- a/app/basic_operator_panel/index.php
+++ b/app/basic_operator_panel/index.php
@@ -163,7 +163,7 @@
 					$cache = new cache;
 					if (!empty($extension)) {
 						$cache->delete(gethostname().":directory:".$extension."@".$this->domain_name);
-						$cache->delete("directory:".$extension."@".$domain_name);
+						$cache->delete(gethostname().":directory:".$extension."@".$domain_name);
 					}
 					if (!empty($number_alias)) {
 						$cache->delete(gethostname().":directory:".$number_alias."@".$this->domain_name);
diff --git a/app/gateways/resources/classes/gateways.php b/app/gateways/resources/classes/gateways.php
index e5f41c9a5d..1951b9d366 100644
--- a/app/gateways/resources/classes/gateways.php
+++ b/app/gateways/resources/classes/gateways.php
@@ -460,10 +460,8 @@
 									save_gateway_xml();
 
 								//clear the cache
-									$esl = event_socket::create();
-									$hostname = trim(event_socket::api('hostname'));
 									$cache = new cache;
-									$cache->delete("configuration:sofia.conf:".$hostname);
+									$cache->delete(gethostname().":configuration:sofia.conf");
 
 								//create the event socket connection
 									$esl = event_socket::create();
@@ -583,10 +581,8 @@
 									save_gateway_xml();
 
 								//clear the cache
-									$esl = event_socket::create();
-									$hostname = trim(event_socket::api('hostname'));
 									$cache = new cache;
-									$cache->delete("configuration:sofia.conf:".$hostname);
+									$cache->delete(gethostname().":configuration:sofia.conf");
 
 								//set message
 									message::add($text['message-copy']);
diff --git a/app/sip_profiles/resources/classes/sip_profiles.php b/app/sip_profiles/resources/classes/sip_profiles.php
index be7e7d2e87..324232fb56 100644
--- a/app/sip_profiles/resources/classes/sip_profiles.php
+++ b/app/sip_profiles/resources/classes/sip_profiles.php
@@ -182,9 +182,7 @@
 										}
 									}
 									if ($empty_hostname) {
-
-											$hostnames[] = gethostname();
-
+										$hostnames[] = gethostname();
 									}
 
 								//clear the cache
@@ -266,7 +264,7 @@
 								//clear the cache
 									if (!empty($sip_profile_hostname)) {
 										$cache = new cache;
-										$cache->delete("configuration:sofia.conf:".$sip_profile_hostname);
+										$cache->delete($sip_profile_hostname.":"configuration:sofia.conf");
 									}
 
 							}
@@ -331,7 +329,7 @@
 
 								//get system hostname if necessary
 									if (empty($sip_profile_hostname)) {
-											$sip_profile_hostname = gethostname();
+										$sip_profile_hostname = gethostname();
 									}
 
 								//clear the cache
@@ -424,7 +422,7 @@
 										$hostnames = array_unique($hostnames);
 										$cache = new cache;
 										foreach ($hostnames as $hostname) {
-											$cache->delete("configuration:sofia.conf:".$hostname);
+											$cache->delete($hostname.":configuration:sofia.conf");
 										}
 									}
 
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 4b1e90b00a..c744552fbe 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -241,7 +241,7 @@
 
 		//get the hostname
 			if (empty($sip_profile_hostname) {
-					$sip_profile_hostname = gethostname();
+				$sip_profile_hostname = gethostname();
 			}
 
 		//clear the cache
diff --git a/resources/switch.php b/resources/switch.php
index 4ff0c9a857..5f28d8db14 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -67,10 +67,8 @@ function event_socket_request_cmd($cmd) {
 function remove_config_from_cache($name) {
 	$cache = new cache;
 	$cache->delete($name);
-	$hostname = trim(event_socket_request_cmd('api switchname'));
-	if ($hostname) {
-		$cache->delete($name . ':' . $hostname);
-	}
+	$cache->delete(gethostname() . ':' . $name);
+	$cache->delete($name . ':' . gethostname());
 }
 
 function ListFiles($dir) {