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

Fix an error that occurs on a few systems when adding a domain.

Browse Source
This commit is contained in:
Mark Crane
2013-11-01 15:50:49 +00:00
parent 5cde63191f
commit 10881ae724
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/intercept.lua
+2 -1
View File
@@ -55,6 +55,7 @@ if ( session:ready() ) then
pin_number = session:getVariable("pin_number"); pin_number = session:getVariable("pin_number");
sounds_dir = session:getVariable("sounds_dir"); sounds_dir = session:getVariable("sounds_dir");
domain_name = session:getVariable("domain_name"); domain_name = session:getVariable("domain_name");
context = session:getVariable("context");
--set the sounds path for the language, dialect and voice --set the sounds path for the language, dialect and voice
default_language = session:getVariable("default_language"); default_language = session:getVariable("default_language");
@@ -100,7 +101,7 @@ if ( session:ready() ) then
sql = sql .. "and presence_id = '"..extension.."@"..domain_name.."' "; sql = sql .. "and presence_id = '"..extension.."@"..domain_name.."' ";
else else
if (domain_count > 1) then if (domain_count > 1) then
sql = sql .. "and context = '"..domain_name.."' "; sql = sql .. "and context = '"..context.."' ";
end end
end end
if (debug["sql"]) then if (debug["sql"]) then
resources/switch.php
+1 -1
View File
@@ -160,7 +160,7 @@ foreach($settings_array as $name => $value) {
//get the extensions that are assigned to this user //get the extensions that are assigned to this user
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/extensions/app_config.php")) { if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/extensions/app_config.php")) {
if (strlen($_SESSION["user_uuid"]) > 0 && count($_SESSION['user']['extension']) == 0) { if (strlen($_SESSION["domain_uuid"]) > 0 && strlen($_SESSION["user_uuid"]) > 0 && count($_SESSION['user']['extension']) == 0) {
//get the user extension list //get the user extension list
unset($_SESSION['user']['extension']); unset($_SESSION['user']['extension']);
$sql = "select e.extension, e.user_context, e.extension_uuid, e.outbound_caller_id_name, e.outbound_caller_id_number from v_extensions as e, v_extension_users as u "; $sql = "select e.extension, e.user_context, e.extension_uuid, e.outbound_caller_id_name, e.outbound_caller_id_number from v_extensions as e, v_extension_users as u ";