From f77e978914d50bd2180efe995c1dd1a5348954d0 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 5 May 2016 13:22:08 -0600 Subject: [PATCH 1/3] Conditional includes if the config.php exists this fixes css.php for the install. --- resources/require.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/require.php b/resources/require.php index c384b55482..bf146a6b97 100644 --- a/resources/require.php +++ b/resources/require.php @@ -29,15 +29,15 @@ //find and include the config.php file if (file_exists("/etc/fusionpbx/config.php")) { + $config_exists = true; include "/etc/fusionpbx/config.php"; } elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) { + $config_exists = true; include "/usr/local/etc/fusionpbx/config.php"; } elseif (file_exists("resources/config.php")) { - include "resources/config.php"; - } - else { + $config_exists = true; include "resources/config.php"; } @@ -71,9 +71,11 @@ //additional includes require_once "resources/php.php"; - require "resources/pdo.php"; require_once "resources/functions.php"; - require_once "resources/switch.php"; + if ($config_exists) { + require "resources/pdo.php"; + require_once "resources/switch.php"; + } //change language on the fly - for translate tool (if available) if (isset($_REQUEST['view_lang_code']) && ($_REQUEST['view_lang_code']) != '') { From 7b9ca616372a784316f9aec3feefbb9f44c3a31c Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 5 May 2016 13:33:02 -0600 Subject: [PATCH 2/3] Change the background color of the footer during the install. --- core/install/install.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/install/install.php b/core/install/install.php index dd1c3a635d..fbbbf4396b 100644 --- a/core/install/install.php +++ b/core/install/install.php @@ -29,6 +29,12 @@ require_once "resources/functions.php"; require_once "resources/classes/text.php"; +//start a php session + session_start(); + +//set theme settings + $_SESSION['theme']['footer_background_color'] = '#ffffff'; + //initialize variables we are going to use $event_host = ''; $event_port = ''; From ab911a17f27fe8e443a96b97d41ec8430189115f Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 5 May 2016 13:40:01 -0600 Subject: [PATCH 3/3] Set the footer color. --- core/install/install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/install/install.php b/core/install/install.php index fbbbf4396b..bc9538bde4 100644 --- a/core/install/install.php +++ b/core/install/install.php @@ -33,6 +33,7 @@ session_start(); //set theme settings + $_SESSION['theme']['footer_color'] = '#cccccc'; $_SESSION['theme']['footer_background_color'] = '#ffffff'; //initialize variables we are going to use