config.php partly solved, see #117

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6e257ae8042df648001cd7537f94dedb6b0c2880..8693a51c6b33fac51b5028e2b12f7dc643401cc0 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -45,6 +45,9 @@ if (!defined('__SECURITY')) {
 // Non-database functions
 require('inc/functions.php');
 
+// Wrapper functions
+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) {
        // Load special functions
@@ -54,28 +57,28 @@ 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($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
-       OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
+       OUTPUT_HTML('<strong>{--LANG_WARNING--}:</strong> ');
        if (isInstalled()) {
                // You have changed my configuration file!
-               app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
+               app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
        } else {
                // Please run the installation script (maybe again)
-               app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
+               app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
        }
-} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
        // No database password entered!!!
-       OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
+       OUTPUT_HTML('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
 }
 
-// Set dummy config array
-initConfig();
-
-// Set important header_sent
-$GLOBALS['header_sent'] = 0;
-
 // Init fatal messages
 initFatalMessages();
 
@@ -88,19 +91,19 @@ if ((!isInstalling()) && (isInstalled())) {
        // CSS array
        EXT_INIT_CSS_FILES();
 
-       if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
+       if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
                // Connect to DB
-               SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
+               SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);
 
                // Is the link valid?
                if (SQL_IS_LINK_UP()) {
                        // Is it a valid resource?
-                       if (SQL_SELECT_DB($MySQL['dbase'], __FILE__, __LINE__) === true) {
+                       if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
                                // This is required for extension 'optimize' to work
-                               define('__DB_NAME', $MySQL['dbase']);
+                               define('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
                                // Remove MySQL array from namespace
-                               unset($MySQL);
+                               unset($GLOBALS['mysql']);
 
                                // Load configuration stuff
                                loadConfiguration();
@@ -115,7 +118,7 @@ if ((!isInstalling()) && (isInstalled())) {
                                loadIncludeOnce('inc/versions.php');
 
                                // Loading patching system is required here...
-                               loadIncludeOnce('inc/patch-system.php'); // Initialize patch system
+                               loadIncludeOnce('inc/patch-system.php');
 
                                // Run daily reset
                                loadIncludeOnce('inc/check-reset.php');