diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the hostname prefix from the directory cache key

Browse Source
This commit is contained in:
FusionPBX
2026-03-04 11:50:49 -07:00
committed by GitHub
parent a67adad071
commit 075c5a4fa0
16 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/basic_operator_panel/index.php
+7 -7
View File
@@ -113,10 +113,10 @@
//delete extension from the cache //delete extension from the cache
$cache = new cache; $cache = new cache;
if (!empty($row['extension'])) { if (!empty($row['extension'])) {
$cache->delete(gethostname().":directory:".$row['extension']."@".$_SESSION['user']['domain_name']); $cache->delete("directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
} }
if (!empty($number_alias)) { if (!empty($number_alias)) {
$cache->delete(gethostname().":directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']); $cache->delete("directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
} }
//incrment //incrment
@@ -134,10 +134,10 @@
//delete extension from the cache //delete extension from the cache
$cache = new cache; $cache = new cache;
if (!empty($row['extension'])) { if (!empty($row['extension'])) {
$cache->delete(gethostname().":directory:".$row['extension']."@".$_SESSION['user']['domain_name']); $cache->delete("directory:".$row['extension']."@".$_SESSION['user']['domain_name']);
} }
if (!empty($number_alias)) { if (!empty($number_alias)) {
$cache->delete(gethostname().":directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']); $cache->delete("directory:".$row['number_alias']."@".$_SESSION['user']['domain_name']);
} }
//incrment //incrment
@@ -159,11 +159,11 @@
//delete extension from the cache //delete extension from the cache
$cache = new cache; $cache = new cache;
if (!empty($extension)) { if (!empty($extension)) {
$cache->delete(gethostname().":directory:".$extension."@".$this->domain_name); $cache->delete("directory:".$extension."@".$this->domain_name);
$cache->delete(gethostname().":directory:".$extension."@".$domain_name); $cache->delete("directory:".$extension."@".$domain_name);
} }
if (!empty($number_alias)) { if (!empty($number_alias)) {
$cache->delete(gethostname().":directory:".$number_alias."@".$this->domain_name); $cache->delete("directory:".$number_alias."@".$this->domain_name);
} }
} }
app/call_forward/call_forward_edit.php
+2 -2
View File
@@ -425,9 +425,9 @@
//clear the cache //clear the cache
$cache = new cache; $cache = new cache;
$cache->delete(gethostname().":directory:".$extension."@".$_SESSION['domain_name']); $cache->delete("directory:".$extension."@".$_SESSION['domain_name']);
if (!empty($number_alias)) { if (!empty($number_alias)) {
$cache->delete(gethostname().":directory:".$number_alias."@".$_SESSION['domain_name']); $cache->delete("directory:".$number_alias."@".$_SESSION['domain_name']);
} }
//add the message //add the message
app/call_forward/resources/classes/call_forward.php
+4 -4
View File
@@ -164,9 +164,9 @@ class call_forward {
//delete extension from the cache //delete extension from the cache
$cache = new cache; $cache = new cache;
$cache->delete(gethostname() . ":directory:" . $this->extension . "@" . $this->domain_name); $cache->delete("directory:" . $this->extension . "@" . $this->domain_name);
if (!empty($this->number_alias)) { if (!empty($this->number_alias)) {
$cache->delete(gethostname() . ":directory:" . $this->number_alias . "@" . $this->domain_name); $cache->delete("directory:" . $this->number_alias . "@" . $this->domain_name);
} }
} }
@@ -316,9 +316,9 @@ class call_forward {
//clear the cache //clear the cache
$cache = new cache; $cache = new cache;
foreach ($extensions as $uuid => $extension) { foreach ($extensions as $uuid => $extension) {
$cache->delete(gethostname() . ":directory:" . $extension['extension'] . "@" . $_SESSION['domain_name']); $cache->delete("directory:" . $extension['extension'] . "@" . $_SESSION['domain_name']);
if ($extension['number_alias'] != '') { if ($extension['number_alias'] != '') {
$cache->delete(gethostname() . ":directory:" . $extension['number_alias'] . "@" . $_SESSION['domain_name']); $cache->delete("directory:" . $extension['number_alias'] . "@" . $_SESSION['domain_name']);
} }
} }
app/call_forward/resources/classes/do_not_disturb.php
+4 -4
View File
@@ -175,9 +175,9 @@
//delete extension from the cache //delete extension from the cache
$cache = new cache; $cache = new cache;
$cache->delete(gethostname().":directory:".$this->extension."@".$this->domain_name); $cache->delete("directory:".$this->extension."@".$this->domain_name);
if(!empty($this->number_alias)){ if(!empty($this->number_alias)){
$cache->delete(gethostname().":directory:".$this->number_alias."@".$this->domain_name); $cache->delete("directory:".$this->number_alias."@".$this->domain_name);
} }
} //function } //function
@@ -317,9 +317,9 @@
//clear the cache //clear the cache
$cache = new cache; $cache = new cache;
foreach ($extensions as $uuid => $extension) { foreach ($extensions as $uuid => $extension) {
$cache->delete(gethostname().":directory:".$extension['extension']."@".$_SESSION['domain_name']); $cache->delete("directory:".$extension['extension']."@".$_SESSION['domain_name']);
if ($extension['number_alias'] != '') { if ($extension['number_alias'] != '') {
$cache->delete(gethostname().":directory:".$extension['number_alias']."@".$_SESSION['domain_name']); $cache->delete("directory:".$extension['number_alias']."@".$_SESSION['domain_name']);
} }
} }
app/call_forward/resources/classes/follow_me.php
+2 -2
View File
@@ -459,9 +459,9 @@
//clear the cache //clear the cache
$cache = new cache; $cache = new cache;
foreach ($extensions as $uuid => $extension) { foreach ($extensions as $uuid => $extension) {
$cache->delete(gethostname().":directory:".$extension['extension']."@".$_SESSION['domain_name']); $cache->delete("directory:".$extension['extension']."@".$_SESSION['domain_name']);
if ($extension['number_alias'] != '') { if ($extension['number_alias'] != '') {
$cache->delete(gethostname().":directory:".$extension['number_alias']."@".$_SESSION['domain_name']); $cache->delete("directory:".$extension['number_alias']."@".$_SESSION['domain_name']);
} }
} }
app/extension_settings/extension_setting_edit.php
+2 -2
View File
@@ -157,8 +157,8 @@
$parameters['extension_uuid'] = $extension_uuid; $parameters['extension_uuid'] = $extension_uuid;
$extension = $database->select($sql, $parameters, 'row'); $extension = $database->select($sql, $parameters, 'row');
$cache = new cache; $cache = new cache;
$cache->delete(gethostname().":directory:".$extension["extension"]."@".$extension["user_context"]); $cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
$cache->delete(gethostname().":directory:".$extension["number_alias"]."@".$extension["user_context"]); $cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
//redirect the user //redirect the user
if (isset($action)) { if (isset($action)) {
app/extension_settings/resources/classes/extension_settings.php
+4 -4
View File
@@ -172,8 +172,8 @@ class extension_settings {
$parameters['extension_uuid'] = $this->extension_uuid; $parameters['extension_uuid'] = $this->extension_uuid;
$extension = $this->database->select($sql, $parameters, 'row'); $extension = $this->database->select($sql, $parameters, 'row');
$cache = new cache; $cache = new cache;
$cache->delete(gethostname() . ":directory:" . $extension["extension"] . "@" . $extension["user_context"]); $cache->delete("directory:" . $extension["extension"] . "@" . $extension["user_context"]);
$cache->delete(gethostname() . ":directory:" . $extension["number_alias"] . "@" . $extension["user_context"]); $cache->delete("directory:" . $extension["number_alias"] . "@" . $extension["user_context"]);
} }
//set message //set message
@@ -255,8 +255,8 @@ class extension_settings {
$parameters['extension_uuid'] = $this->extension_uuid; $parameters['extension_uuid'] = $this->extension_uuid;
$extension = $this->database->select($sql, $parameters, 'row'); $extension = $this->database->select($sql, $parameters, 'row');
$cache = new cache; $cache = new cache;
$cache->delete(gethostname() . ":directory:" . $extension["extension"] . "@" . $extension["user_context"]); $cache->delete("directory:" . $extension["extension"] . "@" . $extension["user_context"]);
$cache->delete(gethostname() . ":directory:" . $extension["number_alias"] . "@" . $extension["user_context"]); $cache->delete("directory:" . $extension["number_alias"] . "@" . $extension["user_context"]);
//set message //set message
message::add($text['message-toggle']); message::add($text['message-toggle']);
app/extensions/extension_edit.php
+2 -2
View File
@@ -903,9 +903,9 @@
$user_context = $database->select($sql, $parameters, 'column'); $user_context = $database->select($sql, $parameters, 'column');
} }
$cache = new cache; $cache = new cache;
$cache->delete(gethostname().":directory:".$extension."@".$user_context); $cache->delete("directory:".$extension."@".$user_context);
if (permission_exists('number_alias') && !empty($number_alias)) { if (permission_exists('number_alias') && !empty($number_alias)) {
$cache->delete(gethostname().":directory:".$number_alias."@".$user_context); $cache->delete("directory:".$number_alias."@".$user_context);
} }
//clear the destinations session array //clear the destinations session array
app/extensions/resources/classes/extension.php
+4 -4
View File
@@ -742,9 +742,9 @@ class extension {
//clear the cache //clear the cache
foreach ($extensions as $x => $extension) { foreach ($extensions as $x => $extension) {
$cache = new cache; $cache = new cache;
$cache->delete(gethostname() . ":directory:" . $extension['extension'] . "@" . $extension['user_context']); $cache->delete("directory:" . $extension['extension'] . "@" . $extension['user_context']);
if (permission_exists('number_alias') && !empty($extension['number_alias'])) { if (permission_exists('number_alias') && !empty($extension['number_alias'])) {
$cache->delete(gethostname() . ":directory:" . $extension['number_alias'] . "@" . $extension['user_context']); $cache->delete("directory:" . $extension['number_alias'] . "@" . $extension['user_context']);
} }
} }
unset($extensions); unset($extensions);
@@ -859,9 +859,9 @@ class extension {
//clear the cache //clear the cache
foreach ($extensions as $uuid => $extension) { foreach ($extensions as $uuid => $extension) {
$cache = new cache; $cache = new cache;
$cache->delete(gethostname() . ":directory:" . $extension['extension'] . "@" . $extension['user_context']); $cache->delete("directory:" . $extension['extension'] . "@" . $extension['user_context']);
if (permission_exists('number_alias') && !empty($extension['number_alias'])) { if (permission_exists('number_alias') && !empty($extension['number_alias'])) {
$cache->delete(gethostname() . ":directory:" . $extension['number_alias'] . "@" . $extension['user_context']); $cache->delete("directory:" . $extension['number_alias'] . "@" . $extension['user_context']);
} }
} }
unset($extensions); unset($extensions);
app/extensions/resources/dashboard/caller_id.php
+1 -1
View File
@@ -117,7 +117,7 @@
//clear the cache //clear the cache
$cache = new cache; $cache = new cache;
foreach($_SESSION['user']['extension'] as $field) { foreach($_SESSION['user']['extension'] as $field) {
$cache->delete(gethostname().":directory:".$field['destination']."@".$field['user_context']); $cache->delete("directory:".$field['destination']."@".$field['user_context']);
} }
//set the message //set the message
app/switch/resources/scripts/app/feature_event/index.lua
+1 -1
View File
@@ -358,5 +358,5 @@
end end
--clear the cache --clear the cache
if (feature_enabled ~= nil) then if (feature_enabled ~= nil) then
cache.del(hostname..":directory:"..user.."@"..host) cache.del("directory:"..user.."@"..host)
end end
app/switch/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
+3 -3
View File
@@ -161,7 +161,7 @@
-- or we do not need dial-string. In other way we have to use database. -- or we do not need dial-string. In other way we have to use database.
if (continue) and (not USE_FS_PATH) then if (continue) and (not USE_FS_PATH) then
if (cache.support() and domain_name) then if (cache.support() and domain_name) then
local cache_key, err = hostname .. ":directory:" .. (from_user or user) .. "@" .. domain_name local cache_key, err = "directory:" .. (from_user or user) .. "@" .. domain_name
XML_STRING, err = cache.get(cache_key); XML_STRING, err = cache.get(cache_key);
if debug['cache'] then if debug['cache'] then
@@ -774,7 +774,7 @@
--set the cache --set the cache
if cache.support() then if cache.support() then
local cache_key = hostname .. ":directory:" .. sip_from_number .. "@" .. domain_name local cache_key = "directory:" .. sip_from_number .. "@" .. domain_name
if debug['cache'] then if debug['cache'] then
freeswitch.consoleLog("notice", "[xml_handler][directory][cache] set key: " .. cache_key .. "\n") freeswitch.consoleLog("notice", "[xml_handler][directory][cache] set key: " .. cache_key .. "\n")
end end
@@ -784,7 +784,7 @@
end end
if sip_from_number ~= sip_from_user then if sip_from_number ~= sip_from_user then
cache_key = hostname .. ":directory:" .. sip_from_user .. "@" .. domain_name cache_key = "directory:" .. sip_from_user .. "@" .. domain_name
if debug['cache'] then if debug['cache'] then
freeswitch.consoleLog("notice", "[xml_handler][directory][cache] set key: " .. cache_key .. "\n") freeswitch.consoleLog("notice", "[xml_handler][directory][cache] set key: " .. cache_key .. "\n")
end end
app/switch/resources/scripts/call_forward.lua
+2 -2
View File
@@ -308,9 +308,9 @@
--clear the cache --clear the cache
if extension and #extension > 0 and cache.support() then if extension and #extension > 0 and cache.support() then
cache.del(hostname..":directory:"..extension.."@"..domain_name); cache.del("directory:"..extension.."@"..domain_name);
if #number_alias > 0 then if #number_alias > 0 then
cache.del(hostname..":directory:"..number_alias.."@"..domain_name); cache.del("directory:"..number_alias.."@"..domain_name);
end end
end end
app/switch/resources/scripts/dial_string.lua
+4 -4
View File
@@ -235,17 +235,17 @@ if ( session:ready() ) then
--clear the cache --clear the cache
if (user_name ~= nil and context ~= nil) then if (user_name ~= nil and context ~= nil) then
if (cache.support()) then if (cache.support()) then
cache.del(hostname..":directory:"..user_name.."@"..context); cache.del("directory:"..user_name.."@"..context);
if #number_alias > 0 then if #number_alias > 0 then
cache.del(hostname..":directory:"..number_alias.."@"..domain_name); cache.del("directory:"..number_alias.."@"..domain_name);
end end
end end
end end
if (db_extension ~= nil and context ~= nil) then if (db_extension ~= nil and context ~= nil) then
if (cache.support()) then if (cache.support()) then
cache.del(hostname..":directory:"..db_extension.."@"..context); cache.del("directory:"..db_extension.."@"..context);
if #number_alias > 0 then if #number_alias > 0 then
cache.del(hostname..":directory:"..number_alias.."@"..domain_name); cache.del("directory:"..number_alias.."@"..domain_name);
end end
end end
end end
app/switch/resources/scripts/do_not_disturb.lua
+2 -2
View File
@@ -265,9 +265,9 @@
--clear the cache --clear the cache
if extension and #extension > 0 and cache.support() then if extension and #extension > 0 and cache.support() then
cache.del(hostname..":directory:"..extension.."@"..context); cache.del("directory:"..extension.."@"..context);
if #number_alias > 0 then if #number_alias > 0 then
cache.del(hostname..":directory:"..number_alias.."@"..context); cache.del("directory:"..number_alias.."@"..context);
end end
end end
app/switch/resources/scripts/follow_me.lua
+2 -2
View File
@@ -137,9 +137,9 @@
--clear the cache --clear the cache
if (extension ~= nil) and cache.support() then if (extension ~= nil) and cache.support() then
cache.del(hostname..":directory:"..extension.."@"..domain_name); cache.del("directory:"..extension.."@"..domain_name);
if #number_alias > 0 then if #number_alias > 0 then
cache.del(hostname..":directory:"..number_alias.."@"..domain_name); cache.del("directory:"..number_alias.."@"..domain_name);
end end
end end