From 2bac44aee7e5500034dd73bcd87d371e1445a707 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Mon, 13 Jan 2014 14:34:13 +0000 Subject: [PATCH] Add app/dialplan/ to the dialplan class path. --- app/call_flows/call_flow_edit.php | 2 +- app/dialplan/app_defaults.php | 4 +++- app/dialplan/dialplan_advanced.php | 2 +- app/ivr_menu/resources/classes/ivr_menu.php | 2 +- resources/install.php | 2 +- resources/switch.php | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index f324117546..5745bda0d9 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -223,7 +223,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { dialplan_add($_SESSION['domain_uuid'], $dialplan_uuid, $dialplan_name, $dialplan_order, $dialplan_context, $dialplan_enabled, $dialplan_description, $app_uuid); //dialplan group 1 - require_once "resources/classes/dialplan.php"; + require_once "app/dialplan/resources/classes/dialplan.php"; // $dialplan = new dialplan; diff --git a/app/dialplan/app_defaults.php b/app/dialplan/app_defaults.php index 1fe89ff27e..07abc2b311 100644 --- a/app/dialplan/app_defaults.php +++ b/app/dialplan/app_defaults.php @@ -25,6 +25,7 @@ */ //if there is more than one domain then set the default context to the domain name + /* if (count($_SESSION['domains']) > 1) { $sql = "select * from v_dialplans "; $sql .= "where dialplan_context = 'default' "; @@ -43,6 +44,7 @@ unset($sql); } } + */ //only run the following code if the directory exists if (is_dir($_SESSION['switch']['dialplan']['dir'])) { @@ -79,7 +81,7 @@ $dialplan_order = 0; } //dialplan class - require_once "resources/classes/dialplan.php"; + require_once "app/dialplan/resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $domain_uuid; $dialplan->dialplan_order = $dialplan_order; diff --git a/app/dialplan/dialplan_advanced.php b/app/dialplan/dialplan_advanced.php index 7886f3c5ae..cef5ef563c 100644 --- a/app/dialplan/dialplan_advanced.php +++ b/app/dialplan/dialplan_advanced.php @@ -45,7 +45,7 @@ $page["title"] = $text['title-default_dialplan']; if ($_GET['a'] == "default" && permission_exists('dialplan_advanced_edit')) { //create the dialplan/default.xml for single tenant or dialplan/domain.xml - require_once "resources/classes/dialplan.php"; + require_once "app/dialplan/resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $_SESSION['domain_uuid']; $dialplan->switch_dialplan_dir = $_SESSION['switch']['dialplan']['dir']; diff --git a/app/ivr_menu/resources/classes/ivr_menu.php b/app/ivr_menu/resources/classes/ivr_menu.php index 81eea37214..cbba5010ee 100644 --- a/app/ivr_menu/resources/classes/ivr_menu.php +++ b/app/ivr_menu/resources/classes/ivr_menu.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "resources/classes/dialplan.php"; +require_once "app/dialplan/resources/classes/dialplan.php"; //define the directory class class ivr_menu { diff --git a/resources/install.php b/resources/install.php index aabb6f49de..13e3cb8888 100644 --- a/resources/install.php +++ b/resources/install.php @@ -1269,7 +1269,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist //print_r($install->result); //create the dialplan/default.xml for single tenant or dialplan/domain.xml - require_once "resources/classes/dialplan.php"; + require_once "app/dialplan/resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $_SESSION["domain_uuid"]; $dialplan->domain = $domain_name; diff --git a/resources/switch.php b/resources/switch.php index 36744ae3dc..b07688e6df 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -2466,7 +2466,7 @@ if (!function_exists('save_call_center_xml')) { global $db, $domain_uuid; //include the classes - include "resources/classes/dialplan.php"; + include "app/dialplan/resources/classes/dialplan.php"; $sql = "select * from v_call_center_queues "; $prep_statement = $db->prepare(check_sql($sql));