Even more code moved, thanks to km4l again. :)

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e18c8cec126d799f2a042497a424bc603f193e16..40a86ef8f9ec909cde97e4f04ff6db6abec42b39 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -132,15 +132,11 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
        }
 } else {
-       ///////////////////////////////////////////////////
-       // Include neccessary functions for installation //
-       ///////////////////////////////////////////////////
-
        // Default output is 'direct' for HTML output
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getScriptOutputMode() == 1) {
+       if (isCssOutputMode()) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
@@ -149,20 +145,14 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('_DB_TYPE', 'mysql3');
 
        // Include more
-       foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
-
-       // Run the init filter chain
-       runFilterChain('init');
-
-       // Are we installation routine?
-       if ((!isInstalling()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
-               // You have to install first!
+       // Check wether we are in installation routine
+       if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+               // Redirect to the URL
                redirectToUrl('install.php');
        } // END - if
 }