Some unneccessary parts removed because we have isInstalling() now

diff --git a/inc/header.php b/inc/header.php
index 81ac82889fbc4d1fce384457cbb295e05e08ceac..2d4a25c4553631ffee886a27cd3c8cfb08c1b962 100644 (file)
--- 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
                                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
 
                        }
                } // END - if
 

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index bc2a1321eb1a74849830d3b5ab3042426d74762f..84b149ef3ee036302ffd7b8c9790042ca90a3d44 100644 (file)
--- 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--}");
        }
                // 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("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
        // No database password entered!!!
        OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }


@@ -200,7 +200,7 @@ if ((!isInstalling()) && (isInstalled())) {
        LOAD_INC_ONCE("inc/databases.php");
 
        // Check if we are in installation routine
        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
                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index be068d59a01ccb62887e318346cfb66dffb78080..a5c7535d7cd0fd7b5c7376c36484c9914040db85 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -48,7 +48,7 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
 );
 
 // 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");
 
 // When no CSS output-mode is set, set it to file-output
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");