Rewritten to fix double-init of session

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index fdc059a8fb27904640f3cce2499486a0081d2199..84c9a6a1e31a354de1c029e4f4894eadb497d186 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,65 +43,20 @@ define('DEBUG_SQL', false);
 // Non-database functions
 require("inc/functions.php");
 
-// Filter functions
-LOAD_INC_ONCE("inc/filters.php");  
-
-// Functions which interact with the database
-LOAD_INC_ONCE("inc/mysql-manager.php");
-
-// Load extensions and language
-LOAD_INC_ONCE("inc/extensions.php");
-
-// Load database library
-LOAD_INC_ONCE("inc/db/lib.php");
-
-// Error handler function
-function __errorHandler ($errno, $errstr, $errfile, $errline) {
-       // Construct message
-       $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
-               $errno,
-               $errstr,
-               basename($errfile),
-               $errline
-       );
-
-       // Write debug log message
-       DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true);
-
-       // Output message to user and die
-       if (EXT_IS_ACTIVE("debug")) {
-               // Debug extension found! So Output a small message
-               mxchange_die("Error message written to debug.log. Please try to call <a href=\"{!URL!}\">the main page</a> to continue.");
-       } else {
-               // No debug extension found, so regular output
-               debug_report_bug($msg);
-       }
-}
+// Load more function libraries or includes
+foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks', 'session') as $lib) {
+       // Load special functions
+       LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
+} // END - foreach
 
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Call-back function for running shutdown functions and close database connection
-function __SHUTDOWN_HOOK () {
-       global $link;
-
-       // Call the filter chain 'shutdown'
-       RUN_FILTER('shutdown', null, false);
-
-       if (is_resource($link)) {
-               // Close link
-               SQL_CLOSE($link, __FILE__, __LINE__);
-       } else {
-               // No database link
-               addFatalMessage(getMessage('NO_DB_LINK'));
-       }
-}
-
 // Register shutdown hook
 register_shutdown_function('__SHUTDOWN_HOOK');
 
 // Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // No login entered and outside installation mode
        OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
        if (isBooleanConstantAndTrue('mxchange_installed')) {
@@ -111,7 +66,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
                // Please run the installation script (maybe again)
                mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
        }
-} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!
        OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
@@ -127,8 +82,7 @@ $_CONFIG = array(
 $GLOBALS['header_sent'] = 0;
 
 // Init fatal messages
-global $FATAL;
-$FATAL = array();
+initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
@@ -136,21 +90,16 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
 
        // CSS array
-       $EXT_CSS_FILES = array();
+       EXT_INIT_CSS_FILES();
 
        if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
                // Connect to DB
-               global $link;
-               $link = SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
+               SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
 
                // Is the link valid?
-               if (is_resource($link)) {
-                       // Choose the database
-                       global $db;
-                       $db = SQL_SELECT_DB($MySQL['dbase'], $link, __FILE__, __LINE__);
-
+               if (SQL_IS_LINK_UP()) {
                        // Is it a valid resource?
-                       if ($db === true) {
+                       if (SQL_SELECT_DB($MySQL['dbase'], __FILE__, __LINE__) === true) {
                                // This is required for extension 'optimize' to work
                                define('__DB_NAME', $MySQL['dbase']);
 
@@ -166,9 +115,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Loading patching system is required here...
                                LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
 
-                               // Session management
-                               LOAD_INC_ONCE("inc/session.php");
-
                                // Run daily reset
                                LOAD_INC_ONCE("inc/check-reset.php");
 
@@ -247,7 +193,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
                        // No link to database!
                        addFatalMessage(getMessage('NO_DB_LINK'));
-                       $db = false;
                }
        } else {
                // Add language system
@@ -263,11 +208,9 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
-       $link = false; // No database link by default
 
-       // Include required files
+       // Include databases.php
        LOAD_INC_ONCE("inc/databases.php");
-       LOAD_INC_ONCE("inc/session.php");
 
        // Check if we are in installation routine
        if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {