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

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();

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;

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;

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;

includes/classes/array_order.php

@@ -1,4 +1,5 @@
 <?php
+
 class array_order {
 
 	var $sort_fields;

includes/classes/database.php

@@ -531,7 +531,7 @@ if (!function_exists('php_right')) {
 //example usage
 /*
 //find
-	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;
@@ -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;

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();

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());

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

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;

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;

resources/menu.php

@@ -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'];

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();

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;

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'];