From 1c4a8db23b33255c699124c2f5905695865d1d20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 7 Mar 2009 01:30:51 +0000 Subject: [PATCH] Some unneccessary parts removed because we have isInstalling() now --- inc/header.php | 2 +- inc/mysql-connect.php | 4 ++-- inc/stylesheet.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/header.php b/inc/header.php index 81ac82889f..2d4a25c455 100644 --- a/inc/header.php +++ b/inc/header.php @@ -89,7 +89,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) { define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE')); // Do not add the fatal message in installation mode - if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND')); + if (!isInstalling()) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND')); } } // END - if diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index bc2a1321eb..84b149ef3e 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -65,7 +65,7 @@ if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('instal // Please run the installation script (maybe again) mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}"); } -} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { +} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) { // No database password entered!!! OUTPUT_HTML("
{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}"); } @@ -200,7 +200,7 @@ if ((!isInstalling()) && (isInstalled())) { LOAD_INC_ONCE("inc/databases.php"); // Check if we are in installation routine - if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) { + if ((!isInstalling()) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) { // Redirect to the installation system LOAD_URL("install.php"); } // END - if diff --git a/inc/stylesheet.php b/inc/stylesheet.php index be068d59a0..a5c7535d7c 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -48,7 +48,7 @@ $STYLES = array( ); // Add stylesheet for installation -if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isInstalled()) || (REQUEST_ISSET_GET(('installing')))) $STYLES[] = "install.css"; +if ((isInstalling()) || (!isInstalled())) $STYLES[] = "install.css"; // When no CSS output-mode is set, set it to file-output if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE"); -- 2.30.2