Move references to php classes in includes/classes to resource/classes.

This commit is contained in:
Mark Crane
2013-07-06 07:13:36 +00:00
parent 60f06a644d
commit 3a58d1e08d
33 changed files with 43 additions and 42 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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;
+5 -5
View File
@@ -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;
+1 -1
View File
@@ -61,7 +61,7 @@ require_once "resources/require.php";
$v_menu .= "<div id=\"menu\" style=\"position: relative; z-index:199; width:100%;\" align='left'>\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'];
+1 -1
View File
@@ -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();
+1 -1
View File
@@ -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;
+3 -3
View File
@@ -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));