From fd9c4ffada03b6930a33bda9c2e5e4ca813a38e1 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Tue, 19 Nov 2013 16:15:00 +0000 Subject: [PATCH] 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. --- resources/install.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/install.php b/resources/install.php index c1e969fe98..aabb6f49de 100644 --- a/resources/install.php +++ b/resources/install.php @@ -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 .= "\n"; $tmp_config .= "?>"; - if (is_dir($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources")) { - $config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php"; - } elseif (is_dir("/etc/fusionpbx")){ + + if (is_dir("/etc/fusionpbx")){ $config = "/etc/fusionpbx/config.php"; } elseif (is_dir("/usr/local/etc/fusionpbx")){ $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 { $config = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/config.php"; }