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

config.php can be located in /etc/fusionpbx this change makes it use that location during install if it exists. Thanks Richard Neese who reported this error and the solution.

Browse Source
This commit is contained in:
Mark Crane
2013-11-19 16:15:00 +00:00
parent 8131f3473e
commit 8076d2af85
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install.php
+5 -3
View File
@@ -449,13 +449,15 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
$tmp_config .= " error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ); //hide notices and warnings"; $tmp_config .= " error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ); //hide notices and warnings";
$tmp_config .= "\n"; $tmp_config .= "\n";
$tmp_config .= "?>"; $tmp_config .= "?>";
if (is_dir($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources")) {
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php"; if (is_dir("/etc/fusionpbx")){
} elseif (is_dir("/etc/fusionpbx")){
$config = "/etc/fusionpbx/config.php"; $config = "/etc/fusionpbx/config.php";
} elseif (is_dir("/usr/local/etc/fusionpbx")){ } elseif (is_dir("/usr/local/etc/fusionpbx")){
$config = "/usr/local/etc/fusionpbx/config.php"; $config = "/usr/local/etc/fusionpbx/config.php";
} }
elseif (is_dir($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources")) {
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php";
}
else { else {
$config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php"; $config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php";
} }