Change the path for includes/require.php to the resources directory.

core/apps/apps.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (if_group("admin") || if_group("superadmin")) {
 	//access granted

core/apps/apps_delete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (if_group("superadmin")) {
 	//access granted

core/apps/apps_edit.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (if_group("superadmin")) {
 	//access granted

core/backup/backup.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 
 if (if_group("superadmin")) {

core/backup/backupandrestore.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 
 if (if_group("superadmin")) {

core/databases/database_delete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('database_delete')) {
 	//access granted

core/databases/database_edit.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('database_add') || permission_exists('database_edit')) {
 	//access granted

core/databases/databases.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (if_group("superadmin")) {
 	//access granted

core/default_settings/default_setting_delete.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('default_setting_delete')) {
 	//access granted

core/default_settings/default_setting_edit.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('default_setting_add') || permission_exists('default_setting_edit')) {
 	//access granted

core/default_settings/default_settings.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('default_setting_view')) {
 	//access granted

core/domain_settings/domain_settings.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('domain_setting_view')) {
 	//access granted

core/domain_settings/domain_settings_delete.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('domain_setting_delete')) {
 	//access granted

core/domain_settings/domain_settings_edit.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('domain_setting_add') || permission_exists('domain_setting_edit')) {
 	//access granted

core/domain_settings/domains.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('domain_view')) {
 	//access granted

core/domain_settings/domains_delete.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('domain_delete')) {
 	//access granted

core/domain_settings/domains_edit.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('domain_add') || permission_exists('domain_edit')) {
 	//access granted

core/menu/menu.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) {
 	//access granted

core/menu/menu_delete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (if_group("admin") || if_group("superadmin")) {
 	//access granted

core/menu/menu_edit.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_add') || permission_exists('menu_edit')) {
 	//access granted

core/menu/menu_item_delete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_delete')) {
 	//access granted

core/menu/menu_item_edit.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_add') || permission_exists('menu_edit')) {
 	//access granted

core/menu/menu_item_list.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) {
 	//access granted

core/menu/menu_item_move_down.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_edit')) {
 	//access granted

core/menu/menu_item_move_up.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_edit')) {
 	//access granted

core/menu/menu_restore_default.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('menu_restore')) {
 	//access granted

core/upgrade/upgrade.php

@@ -30,7 +30,7 @@
 		preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
 		$document_root = $matches[1];
 		set_include_path($document_root);
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		$_SERVER["DOCUMENT_ROOT"] = $document_root;
 		$display_type = 'text'; //html, text
 
@@ -42,7 +42,7 @@
 	}
 	else {
 		include "root.php";
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		require_once "resources/check_auth.php";
 		if (permission_exists('upgrade_schema') || permission_exists('upgrade_svn') || if_group("superadmin")) {
 			//echo "access granted";

core/upgrade/upgrade_domains.php

@@ -30,13 +30,13 @@
 		preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
 		$document_root = $matches[1];
 		set_include_path($document_root);
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		$_SERVER["DOCUMENT_ROOT"] = $document_root;
 		$display_type = 'text'; //html, text
 	}
 	else {
 		include "root.php";
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		require_once "resources/check_auth.php";
 		if (permission_exists('upgrade_schema') || permission_exists('upgrade_svn') || if_group("superadmin")) {
 			//echo "access granted";

core/upgrade/upgrade_schema.php

@@ -30,7 +30,7 @@
 		preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
 		$document_root = $matches[1];
 		set_include_path($document_root);
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		$_SERVER["DOCUMENT_ROOT"] = $document_root;
 		$display_type = 'text'; //html, text
 
@@ -42,7 +42,7 @@
 	}
 	else {
 		include "root.php";
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		require_once "resources/check_auth.php";
 		if (permission_exists('upgrade_schema') || if_group("superadmin")) {
 			//echo "access granted";

core/user_settings/user_dashboard.php

@@ -28,7 +28,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/includes/config.php"))
 	header("Location: ".PROJECT_PATH."/install.php");
 	exit;
 }
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 require_once "includes/header.php";
 

core/user_settings/user_edit.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 include "app_languages.php";
 

core/users/group_permissions.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_permissions') || if_group("superadmin")) {
 	//access granted

core/users/groupadd.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_add')) {
 	//access allowed

core/users/groupdelete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_delete') || if_group("superadmin")) {
 	//access allowed

core/users/groupmemberadd.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_member_add') || if_group("superadmin")) {
 	//access allowed

core/users/groupmemberdelete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_member_delete') || if_group("superadmin")) {
 	//access allowed

core/users/groupmembers.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_members_view') || if_group("superadmin")) {
 	//access allowed

core/users/groups.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 
 //check the permissions
 require_once "resources/check_auth.php";

core/users/index.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('user_view') || if_group("superadmin")) {
 	//access allowed

core/users/permissions_default.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('group_edit')) {
 	//access granted

core/users/signup.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 
 if (if_group("admin") || if_group("superadmin")) {

core/users/userdelete.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists('user_delete')) {
 	//access allowed

core/users/userlist.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists("user_view") || if_group("superadmin")) {
 	//access granted

core/users/usersupdate.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (permission_exists("user_add") ||
 	permission_exists("user_edit") ||

includes/footer.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 
 //get the output from the buffer
 	$body = $content_from_db.ob_get_contents(); 
@@ -67,19 +67,19 @@ require_once "includes/require.php";
 	ob_end_clean(); //clean the buffer
 
 //get the menu
-	require_once "includes/menu.php";
+	require_once "resources/menu.php";
 
 //prepare the template to display the output
 	$custom_head = '';
 	$output = str_replace ("<!--{title}-->", $page["title"], $template); //<!--{title}--> defined in each individual page
 	$output = str_replace ("<!--{head}-->", $custom_head, $output); //<!--{head}--> defined in each individual page
 	if (strlen($v_menu) > 0) {
-		$output = str_replace ("<!--{menu}-->", $v_menu, $output); //defined in /includes/menu.php
+		$output = str_replace ("<!--{menu}-->", $v_menu, $output); //defined in /resources/menu.php
 	}
 	else {
-		$output = str_replace ("<!--{menu}-->", $_SESSION["menu"], $output); //defined in /includes/menu.php
+		$output = str_replace ("<!--{menu}-->", $_SESSION["menu"], $output); //defined in /resources/menu.php
 	}
-	$output = str_replace ("<!--{project_path}-->", PROJECT_PATH, $output); //defined in /includes/menu.php
+	$output = str_replace ("<!--{project_path}-->", PROJECT_PATH, $output); //defined in /resources/menu.php
 
 	$pos = strrpos($output, "<!--{body}-->");
 	if ($pos === false) {

includes/header.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 
 //if reloadxml then run the command
 	if (isset($_SESSION["reload_xml"])) {

includes/lib_pdo_vm.php

@@ -24,7 +24,7 @@
  Mark J Crane <[email protected]>
 */
 include "root.php";
-require "includes/require.php";
+require "resources/require.php";
 
 //get the contents of xml_cdr.conf.xml
 	$conf_xml_string = file_get_contents($_SESSION['switch']['conf']['dir'].'/autoload_configs/voicemail.conf.xml');

includes/lib_schema.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-//require_once "includes/require.php";
+//require_once "resources/require.php";
 //require_once "includes/classes/database.php";
 //$db = new database;
 //$db->db = $db;

includes/lib_switch.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 
 //preferences
 	$v_label_show = false;

includes/menu.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 require_once "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 
 //define the variable
 	$v_menu = '';

index.php

@@ -39,14 +39,14 @@ include "root.php";
 	}
 
 //adds multiple includes
-	require_once "includes/require.php";
+	require_once "resources/require.php";
 
 //show the index page
 	if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/index.php")){
 		require_once "themes/".$_SESSION['domain']['template']['name']."/index.php";
 	}
 	else {
-		require_once "includes/require.php";
+		require_once "resources/require.php";
 		require_once "includes/header.php";
 		echo "<br /><br />\n";
 		require_once "includes/footer.php";

login.php

@@ -31,7 +31,7 @@ include "root.php";
 	}
 
 //adds multiple includes
-	require_once "includes/require.php";
+	require_once "resources/require.php";
 
 //include the login
 	if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/login.php")){

resources/cmd.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 if (if_group("admin") || if_group("superadmin")) {
 	//access granted

resources/download.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 //require_once "resources/check_auth.php";
 
 $file = $_GET["f"];

resources/install.php

@@ -1187,7 +1187,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 		unset($db_tmp);
 
 	//include additional files
-		require "includes/require.php";
+		require "resources/require.php";
 
 	//set the defaults
 		$menu_name = 'default';

resources/secure_download.php

@@ -24,7 +24,7 @@
 	Mark J Crane <[email protected]>
 */
 include "root.php";
-require_once "includes/require.php";
+require_once "resources/require.php";
 require_once "resources/check_auth.php";
 
 //clears if file exists cache