Bläddra i källkod

Update a few more references to files that have been move to the resources directory.

Mark Crane 12 år sedan
förälder
incheckning
53a2159c23
3 ändrade filer med 9 tillägg och 6 borttagningar
  1. 1 1
      core/upgrade/upgrade_schema.php
  2. 1 1
      resources/install.php
  3. 7 4
      resources/require.php

+ 1 - 1
core/upgrade/upgrade_schema.php

@@ -70,7 +70,7 @@
 	}
 	}
 
 
 //load the default database into memory and compare it with the active database
 //load the default database into memory and compare it with the active database
-	require_once "includes/lib_schema.php";
+	require_once "resources/schema.php";
 	db_upgrade_schema ($db, $db_type, $db_name, $display_results);
 	db_upgrade_schema ($db, $db_type, $db_name, $display_results);
 	unset($apps);
 	unset($apps);
 
 

+ 1 - 1
resources/install.php

@@ -1370,7 +1370,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 	echo "<div align='center'>\n";
 	echo "<div align='center'>\n";
 	$msg = '';
 	$msg = '';
 	//make sure the includes directory is writable so the config.php file can be written.
 	//make sure the includes directory is writable so the config.php file can be written.
-		if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/includes/lib_pdo.php")) {
+		if (!is_writable($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/pdo.php")) {
 			$msg .= "<b>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."</b><br />";
 			$msg .= "<b>Write access to ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."</b><br />";
 			$msg .= "and its sub-directories are required during the install.<br /><br />\n";
 			$msg .= "and its sub-directories are required during the install.<br /><br />\n";
 		}
 		}

+ 7 - 4
resources/require.php

@@ -30,11 +30,14 @@ if (file_exists("/etc/fusionpbx/config.php")) {
 elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
 elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
 	include "/usr/local/etc/fusionpbx/config.php";
 	include "/usr/local/etc/fusionpbx/config.php";
 }
 }
-else {
+elseif (file_exists("includes/config.php")) {
 	include "includes/config.php";
 	include "includes/config.php";
 }
 }
-require_once "includes/lib_php.php";
-require "includes/lib_pdo.php";
+else {
+	include "resources/config.php";
+}
+require_once "resources/php.php";
+require "resources/pdo.php";
 require_once "resources/functions.php";
 require_once "resources/functions.php";
-require_once "includes/lib_switch.php";
+require_once "resources/switch.php";
 ?>
 ?>