Merge pull request #1017 from moteus/no_default_domain

Change. Does not use `default` dialplan/directory.
This commit is contained in:
FusionPBX
2015-08-10 11:27:19 -06:00
5 changed files with 10 additions and 45 deletions

View File

@@ -97,12 +97,7 @@ function load_extensions() {
}
//if no extension has been assigned then setting the user_context will still need to be set
if (strlen($_SESSION['user_context']) == 0) {
if (count($_SESSION['domains']) == 1) {
$_SESSION['user_context'] = "default";
}
else {
$_SESSION['user_context'] = $_SESSION['domain_name'];
}
$_SESSION['user_context'] = $_SESSION['domain_name'];
}
}
}
@@ -747,12 +742,7 @@ function save_dialplan_xml() {
global $db, $domain_uuid;
//get the context based from the domain_uuid
if (count($_SESSION['domains']) == 1) {
$user_context = "default";
}
else {
$user_context = $_SESSION['domains'][$domain_uuid]['domain_name'];
}
$user_context = $_SESSION['domains'][$domain_uuid]['domain_name'];
//prepare for dialplan .xml files to be written. delete all dialplan files that are prefixed with dialplan_ and have a file extension of .xml
$dialplan_list = glob($_SESSION['switch']['dialplan']['dir'] . "/*/*v_dialplan*.xml");