dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark Crane 2013-07-06 07:01:14 +00:00
parent f9e8b5b115
commit 3798b9a782
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/sql_query/sql_db_conversion.php
View File

@ -26,7 +26,7 @@
include "root.php"; include "root.php";
require_once "resources/require.php"; require_once "resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
require_once "includes/lib_schema.php"; require_once "resources/schema.php";
if (if_group("superadmin")) { if (if_group("superadmin")) {
//access granted //access granted

2
core/upgrade/upgrade_schema.php
View File

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

2
resources/install.php
View File

@ -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";
} }

11
resources/require.php
View File

@ -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"; else {
require "includes/lib_pdo.php"; 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";
?> ?>