diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index 6d7d8c09da..f324117546 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 "includes/classes/switch_dialplan.php"; + require_once "resources/classes/dialplan.php"; // $dialplan = new dialplan; diff --git a/app/dialplan/app_defaults.php b/app/dialplan/app_defaults.php index 23d245985e..0c29797e18 100644 --- a/app/dialplan/app_defaults.php +++ b/app/dialplan/app_defaults.php @@ -79,7 +79,7 @@ $dialplan_order = 0; } //dialplan class - require_once "includes/classes/switch_dialplan.php"; + require_once "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 36dcafa697..29a8bd3177 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 "includes/classes/switch_dialplan.php"; + require_once "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/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php index 6adfa108b0..5568f7fd8e 100644 --- a/app/extensions/resources/classes/extension.php +++ b/app/extensions/resources/classes/extension.php @@ -69,7 +69,7 @@ public $description; public function __construct() { - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $this->app_uuid = 'e68d9689-2769-e013-28fa-6214bf47fca3'; } diff --git a/app/hunt_groups/hunt_group_edit.php b/app/hunt_groups/hunt_group_edit.php index cc31674db4..49c28ec6a7 100644 --- a/app/hunt_groups/hunt_group_edit.php +++ b/app/hunt_groups/hunt_group_edit.php @@ -219,7 +219,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //update the dialplan entry - require_once "includes/classes/switch_dialplan.php"; + require_once "resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $_SESSION['domain_uuid']; $dialplan->app_uuid = $app_uuid; diff --git a/app/ivr_menu/ivr_menu_delete.php b/app/ivr_menu/ivr_menu_delete.php index b1b7d638f6..55ac38eb9e 100644 --- a/app/ivr_menu/ivr_menu_delete.php +++ b/app/ivr_menu/ivr_menu_delete.php @@ -46,7 +46,7 @@ if (count($_GET)>0) { if (strlen($id)>0) { //include the ivr menu class - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; require_once "resources/classes/switch_ivr_menu.php"; $ivr = new switch_ivr_menu; $ivr->domain_uuid = $_SESSION["domain_uuid"]; diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php index ce78f20d83..c545ae773a 100644 --- a/app/ivr_menu/ivr_menu_edit.php +++ b/app/ivr_menu/ivr_menu_edit.php @@ -181,7 +181,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { //prepare the object - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; require_once "resources/classes/switch_ivr_menu.php"; $ivr = new switch_ivr_menu; $ivr->domain_uuid = $_SESSION["domain_uuid"]; diff --git a/app/ivr_menu/ivr_menu_option_delete.php b/app/ivr_menu/ivr_menu_option_delete.php index d2fa1f9007..bfe5f5fabf 100644 --- a/app/ivr_menu/ivr_menu_option_delete.php +++ b/app/ivr_menu/ivr_menu_option_delete.php @@ -49,7 +49,7 @@ else { //delete the ivr menu option if (strlen($id)>0) { //include the ivr menu class - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; require_once "resources/classes/switch_ivr_menu.php"; $ivr = new switch_ivr_menu; $ivr->domain_uuid = $_SESSION["domain_uuid"]; diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php index b63d194026..40afa53f17 100644 --- a/app/ivr_menu/ivr_menu_option_edit.php +++ b/app/ivr_menu/ivr_menu_option_edit.php @@ -103,7 +103,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { //create the object - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; require_once "resources/classes/switch_ivr_menu.php"; $ivr = new switch_ivr_menu; $ivr->domain_uuid = $_SESSION["domain_uuid"]; diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php index c23553e26a..67b1d601e9 100644 --- a/app/ivr_menu/ivr_menus.php +++ b/app/ivr_menu/ivr_menus.php @@ -75,7 +75,7 @@ else { echo "
\n"; //get the count - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; require_once "resources/classes/switch_ivr_menu.php"; $ivr = new switch_ivr_menu; $ivr->domain_uuid = $_SESSION["domain_uuid"]; diff --git a/app/ivr_menu/resources/classes/switch_ivr_menu.php b/app/ivr_menu/resources/classes/switch_ivr_menu.php index f58d5495c5..3b3005e4b1 100644 --- a/app/ivr_menu/resources/classes/switch_ivr_menu.php +++ b/app/ivr_menu/resources/classes/switch_ivr_menu.php @@ -24,7 +24,7 @@ Mark J Crane */ include "root.php"; -require_once "includes/classes/switch_dialplan.php"; +require_once "resources/classes/dialplan.php"; //define the directory class class switch_ivr_menu { @@ -65,7 +65,7 @@ require_once "includes/classes/switch_dialplan.php"; public $order_by; //array public function __construct() { - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab'; } diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php index 23fb82654a..51eef12ea9 100644 --- a/app/modules/app_defaults.php +++ b/app/modules/app_defaults.php @@ -27,7 +27,7 @@ //use the module class to get the list of modules from the db and add any missing modules if ($domains_processed == 1) { - require_once "includes/classes/switch_modules.php"; + require_once "resources/classes/modules.php"; $mod = new switch_modules; $mod->db = $db; $mod->dir = $_SESSION['switch']['mod']['dir']; diff --git a/app/modules/modules.php b/app/modules/modules.php index 7c166e1e6e..2eab6a8039 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -69,7 +69,7 @@ if (strlen($_GET["a"]) > 0) { } //use the module class to get the list of modules from the db and add any missing modules - require_once "includes/classes/switch_modules.php"; + require_once "resources/classes/modules.php"; $mod = new switch_modules; $mod->db = $db; $mod->dir = $_SESSION['switch']['mod']['dir']; diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php index 552b8e2890..7e5ccf55c3 100644 --- a/app/music_on_hold/resources/classes/switch_music_on_hold.php +++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php @@ -37,7 +37,7 @@ include "root.php"; private $xml; public function __construct() { - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $this->app_uuid = ''; } diff --git a/app/registrations/status_registrations.php b/app/registrations/status_registrations.php index 7b252ee7b9..4c3e8fffac 100644 --- a/app/registrations/status_registrations.php +++ b/app/registrations/status_registrations.php @@ -156,7 +156,7 @@ require_once "resources/check_auth.php"; echo "\n"; //order the array - require_once "includes/classes/array_order.php"; + require_once "resources/classes/array_order.php"; $order = new array_order(); $registrations = $order->sort($registrations, 'domain', 'user'); diff --git a/app/ring_groups/ring_groups_edit.php b/app/ring_groups/ring_groups_edit.php index d6b11a3dd3..359e8a359e 100644 --- a/app/ring_groups/ring_groups_edit.php +++ b/app/ring_groups/ring_groups_edit.php @@ -259,7 +259,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $row = $prep_statement->fetch(PDO::FETCH_ASSOC); if ($row['num_rows'] == 0) { //add the dialplan - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $database = new database; $database->db = $db; $database->table = "v_dialplans"; diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php index e936e70109..15287c2727 100644 --- a/app/xml_cdr/v_xml_cdr_import.php +++ b/app/xml_cdr/v_xml_cdr_import.php @@ -67,7 +67,7 @@ } //prepare the database object - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $database = new database; $database->table = "v_xml_cdr"; diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php index d8e4f75e99..9b576de828 100644 --- a/core/domain_settings/domains.php +++ b/core/domain_settings/domains.php @@ -76,7 +76,7 @@ else { unset($_SESSION['extension_array']); //set the setting arrays //domains set() - require "includes/classes/domains.php"; + require "resources/classes/domains.php"; $domain = new domains(); $domain->db = $db; $domain->set(); diff --git a/core/menu/app_defaults.php b/core/menu/app_defaults.php index de3a70af48..cac39aaf32 100644 --- a/core/menu/app_defaults.php +++ b/core/menu/app_defaults.php @@ -61,7 +61,7 @@ $db->exec(check_sql($sql)); unset($sql); //add the menu items - require_once "includes/classes/menu.php"; + require_once "resources/classes/menu.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $menu_uuid; diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php index 9be8f36e7e..54c635cbf1 100644 --- a/core/menu/menu_edit.php +++ b/core/menu/menu_edit.php @@ -106,7 +106,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //add the default items in the menu - require_once "includes/classes/menu.php"; + require_once "resources/classes/menu.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $menu_uuid; diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index 178c1a9b59..fbf9fea45d 100644 --- a/core/menu/menu_restore_default.php +++ b/core/menu/menu_restore_default.php @@ -45,7 +45,7 @@ else { $menu_language = check_str($_REQUEST["menu_language"]); //menu restore default - require_once "includes/classes/menu.php"; + require_once "resources/classes/menu.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $menu_uuid; diff --git a/includes/classes/array_order.php b/includes/classes/array_order.php index e4e72c1a80..142193e22a 100644 --- a/includes/classes/array_order.php +++ b/includes/classes/array_order.php @@ -1,4 +1,5 @@ domain_uuid = $_SESSION["domain_uuid"]; $database->type = $db_type; @@ -548,7 +548,7 @@ if (!function_exists('php_right')) { $database->find(); print_r($database->result); //insert - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $database = new database; $database->domain_uuid = $_SESSION["domain_uuid"]; $database->type = $db_type; diff --git a/includes/classes/schema.php b/includes/classes/schema.php index 83b86488e7..b98f778206 100644 --- a/includes/classes/schema.php +++ b/includes/classes/schema.php @@ -121,7 +121,7 @@ include "root.php"; } //example use - //require_once "includes/classes/schema.php"; + //require_once "resources/classes/schema.php"; //$schema = new schema; //$schema->db_type = $db_type; //$schema->sql(); diff --git a/includes/classes/switch_fax.php b/includes/classes/switch_fax.php index ea86ad48d8..bd936bdb01 100644 --- a/includes/classes/switch_fax.php +++ b/includes/classes/switch_fax.php @@ -45,7 +45,7 @@ include "root.php"; public $fax_description; public function __construct() { - require_once "includes/classes/database.php"; + require_once "resources/classes/database.php"; $this->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440'; } @@ -521,8 +521,8 @@ include "root.php"; } } /* -require_once "includes/classes/database.php"; -require_once "includes/classes/switch_fax.php"; +require_once "resources/classes/database.php"; +require_once "resources/classes/fax.php"; $fax = new switch_fax; $fax->domain_uuid = $_SESSION["domain_uuid"]; print_r($fax->find()); diff --git a/resources/check_auth.php b/resources/check_auth.php index 141db21555..43964decf7 100644 --- a/resources/check_auth.php +++ b/resources/check_auth.php @@ -60,7 +60,7 @@ session_start(); } //set the domain information if (strlen($domain_name) > 0) { - require_once "includes/classes/domains.php"; + require_once "resources/classes/domains.php"; foreach ($_SESSION['domains'] as &$row) { if ($row['domain_name'] == $domain_name) { //set the domain session variables diff --git a/resources/classes/install.php b/resources/classes/install.php index 954548452b..d705cacc60 100644 --- a/resources/classes/install.php +++ b/resources/classes/install.php @@ -190,7 +190,7 @@ include "root.php"; } //how to use the class - //include "includes/classes/install.php"; + //include "resources/classes/install.php"; //$install = new install; //$install->domain_uuid = $domain_uuid; //$install->switch_conf_dir = $switch_conf_dir; diff --git a/resources/install.php b/resources/install.php index d21d21476c..b9a806e6a0 100644 --- a/resources/install.php +++ b/resources/install.php @@ -491,7 +491,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist $db_tmp->sqliteCreateFunction('now', 'php_now', 0); //add the database structure - require_once "includes/classes/schema.php"; + require_once "resources/classes/schema.php"; $schema = new schema; $schema->db = $db_tmp; $schema->db_type = $db_type; @@ -573,7 +573,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist } //add the database structure - require_once "includes/classes/schema.php"; + require_once "resources/classes/schema.php"; $schema = new schema; $schema->db = $db_tmp; $schema->db_type = $db_type; @@ -740,7 +740,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist } //add the database structure - require_once "includes/classes/schema.php"; + require_once "resources/classes/schema.php"; $schema = new schema; $schema->db = $db_tmp; $schema->db_type = $db_type; @@ -1215,7 +1215,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist unset($sql); //add the menu items - require_once "includes/classes/menu.php"; + require_once "resources/classes/menu.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $menu_uuid; @@ -1267,7 +1267,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 "includes/classes/switch_dialplan.php"; + require_once "resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $_SESSION["domain_uuid"]; $dialplan->domain = $domain_name; diff --git a/resources/menu.php b/resources/menu.php index 8522c6401d..6cd2042652 100644 --- a/resources/menu.php +++ b/resources/menu.php @@ -61,7 +61,7 @@ require_once "resources/require.php"; $v_menu .= "
\n"; $v_menu .= "\n"; - require_once "includes/classes/menu.php"; + require_once "resources/classes/menu.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; diff --git a/resources/pdo.php b/resources/pdo.php index 7feadc60af..0eb600c5cf 100644 --- a/resources/pdo.php +++ b/resources/pdo.php @@ -260,7 +260,7 @@ if ($db_type == "pgsql") { //set the setting arrays if (!isset($_SESSION['domain']['menu'])){ //domains set() - require "includes/classes/domains.php"; + require "resources/classes/domains.php"; $domain = new domains(); $domain->db = $db; $domain->set(); diff --git a/resources/schema.php b/resources/schema.php index 901d12f8cf..81df206858 100644 --- a/resources/schema.php +++ b/resources/schema.php @@ -25,7 +25,7 @@ */ include "root.php"; //require_once "resources/require.php"; -//require_once "includes/classes/database.php"; +//require_once "resources/classes/database.php"; //$db = new database; //$db->db = $db; //$db->db_type = $db_type; diff --git a/resources/switch.php b/resources/switch.php index 4af8a35e29..28cdb19129 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -2129,7 +2129,7 @@ function save_hunt_group_xml() { unset($sql); } - require_once "includes/classes/switch_dialplan.php"; + require_once "resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $domain_uuid; $dialplan->app_uuid = $app_uuid; @@ -2178,7 +2178,7 @@ function save_hunt_group_xml() { //if action is add or update if ($action == 'add' || $action == 'update') { - require_once "includes/classes/switch_dialplan.php"; + require_once "resources/classes/dialplan.php"; $dialplan = new dialplan; $dialplan->domain_uuid = $domain_uuid; $dialplan->dialplan_uuid = $dialplan_uuid; @@ -3080,7 +3080,7 @@ if (!function_exists('save_call_center_xml')) { global $db, $domain_uuid; //include the classes - include "includes/classes/switch_dialplan.php"; + include "resources/classes/dialplan.php"; $sql = "select * from v_call_center_queues "; $prep_statement = $db->prepare(check_sql($sql)); diff --git a/themes/default/template.php b/themes/default/template.php index 888469bb6e..07f81a6e19 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -724,7 +724,7 @@ function confirmdelete(url) { $menu_level = '0'; if ($db) { if (strlen($php_self_parent_uuid) > 0) { - require_once "includes/classes/menu.php"; + require_once "resources/classes/menu.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];