Fixes missing variable CSS in installation phase. Resolved #15

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 9dbbab38743d350f8c06860a537cbc6cc3e68d86..f9f1457e4d078eefb271a0140d232a654c654a18 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -44,7 +44,7 @@ define('DEBUG_SQL', false);
 require_once(PATH."inc/db/lib.php");
 
 // Non-database functions
-require_once(PATH."inc/functions.php");  
+require_once(PATH."inc/functions.php");
 
 // Filter functions
 require_once(PATH."inc/filters.php");  
@@ -74,7 +74,7 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
                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
-               print("Please report this error at <a href=\"http://forum.mxchange.org\" rel=\"external\" target=\"_blank\">forum.mxchange.org</a>:<pre>");
+               print("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
                debug_print_backtrace();
                die("</pre>Thank you for your help finding bugs.");
        }
@@ -83,14 +83,24 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Call-back function for running shutdown functions
-function __RUN_SHUTDOWN_FILTER () {
+// 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
+               ADD_FATAL(NO_DB_LINK);
+       }
 }
 
 // Register shutdown hook
-register_shutdown_function('__RUN_SHUTDOWN_FILTER');
+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'))) {
@@ -145,21 +155,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Load configuration stuff
                                $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
 
-                               // Initialize include-file-pool
-                               $INC_POOL = array();
-
                                // Load "databases" aka static arrays
                                require_once(PATH."inc/databases.php");
 
                                // Loading patching system is required here...
                                require_once(PATH."inc/patch-system.php"); // Initialize patch system
 
-                               // Create missing configuration file
-                               if (!function_exists('GET_CURR_THEME')) {
-                                       // Load dummy theme functions
-                                       require_once(PATH."inc/theme-dummy.php");
-                               } // END - if
-
                                // Session management
                                require_once(PATH."inc/session.php");
 
@@ -185,11 +186,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        $GLOBALS['what']   = "";
                                }
 
-                               // Secure and validate user ID from cookie
-                               UPDATE_LOGIN_DATA();
-
-                               // Update online list
-                               UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
+                               // Run the init filter chain
+                               RUN_FILTER('init');
 
                                // Set default 'what' value
                                //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
@@ -259,21 +257,15 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        ///////////////////////////////////////////////////
 
        // Set other missing variables
+       if (!isset($CSS)) $CSS = "0";
        $link = false; // No database link by default
 
        // Include required files
        require_once(PATH."inc/databases.php");
        require_once(PATH."inc/session.php");
 
-       // Create missing configuration file
-       if (!function_exists('GET_CURR_THEME')) {
-               // Load dummy theme functions
-               require_once(PATH."inc/theme-dummy.php");
-       } // END - if
-
        // Check if we are in installation routine
-       $installPhp = basename($_SERVER['PHP_SELF']);
-       if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+       if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if
@@ -293,9 +285,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        } // END - if
 }
 
-// Init filter system
-INIT_FILTER_SYSTEM();
-
 // Any fatal messages?
 if (!is_array($FATAL)) $FATAL = array();
 if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {