Still a bit silly but seems to work

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f4e1d42d3a81aaec36f3cb735d57b32964f77b14..7bf73db0fbb7e8cce49af4171a5fa9ac3b7bec12 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
@@ -65,6 +65,9 @@ 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');
+
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
@@ -92,9 +95,6 @@ if ((!isInstalling()) && (isInstalled())) {
                                // Load configuration stuff
                                loadConfiguration();
 
-                               // Load "databases" aka static arrays
-                               loadIncludeOnce('inc/databases.php');
-
                                // Init session
                                loadIncludeOnce('inc/session.php');
 
@@ -158,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));
@@ -180,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';
 
@@ -217,8 +226,17 @@ if ((!isInstalling()) && (isInstalled())) {
 
        // Load extension 'sql_patches'
        LOAD_EXTENSION('sql_patches');
+
+       // Load configuration file(s) here
+       loadIncludeOnce('inc/load_config.php');
 }
 
+// Init session
+loadIncludeOnce('inc/session.php');
+
+// Load versions
+loadIncludeOnce('inc/versions.php');
+
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
        // One or more fatal error(s) occur during connect...
        loadIncludeOnce('inc/header.php');