Fixes for broken installation routine

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 8693a51c6b33fac51b5028e2b12f7dc643401cc0..20d19f4b365de63b4a3f94801aa4fa46b7cfa14d 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -49,7 +49,7 @@ require('inc/functions.php');
 require('inc/wrapper-functions.php');
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -57,33 +57,26 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Load configuration file(s) here
-loadIncludeOnce('inc/load_config.php');
-
 // Set important header_sent
 $GLOBALS['header_sent'] = 0;
 
-// Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
-       // No login entered and outside installation mode
-       OUTPUT_HTML('<strong>{--LANG_WARNING--}:</strong> ');
-       if (isInstalled()) {
-               // You have changed my configuration file!
-               app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
-       } else {
-               // Please run the installation script (maybe again)
-               app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
-       }
-} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
-       // No database password entered!!!
-       OUTPUT_HTML('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
-}
-
 // Init fatal messages
 initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if ((!isInstalling()) && (isInstalled())) {
+       // Load "databases" aka static arrays
+       loadIncludeOnce('inc/databases.php');
+
+       // Init session
+       loadIncludeOnce('inc/session.php');
+
+       // Load versions
+       loadIncludeOnce('inc/versions.php');
+
+       // Load configuration file(s) here
+       loadIncludeOnce('inc/load_config.php');
+
        // Check for write-permission for config.php and inc directory
        if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
        if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'index';
@@ -108,15 +101,6 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Load configuration stuff
                                loadConfiguration();
 
-                               // Load "databases" aka static arrays
-                               loadIncludeOnce('inc/databases.php');
-
-                               // Init session
-                               loadIncludeOnce('inc/session.php');
-
-                               // Load versions
-                               loadIncludeOnce('inc/versions.php');
-
                                // Loading patching system is required here...
                                loadIncludeOnce('inc/patch-system.php');
 
@@ -174,7 +158,7 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Is the extension sql_patches installed and at least 0.3.6?
                                if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
                                        // Generate random number
-                                       define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ''));
+                                       define('RAND_NUMBER', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
                                } else {
                                        // Generate weak (!!!) code
                                        define('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -196,6 +180,15 @@ if ((!isInstalling()) && (isInstalled())) {
        // 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 ($GLOBALS['output_mode'] == '1') {
+               // Problem with config so set output mode
+               setConfigEntry('OUTPUT_MODE', 'render');
+       } // END - if
+
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
 
@@ -233,6 +226,9 @@ if ((!isInstalling()) && (isInstalled())) {
 
        // Load extension 'sql_patches'
        LOAD_EXTENSION('sql_patches');
+
+       // Load configuration file(s) here
+       loadIncludeOnce('inc/load_config.php');
 }
 
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {