Fixes missing variable CSS in installation phase. Resolved #15
[mailer.git] / inc / mysql-connect.php
index 6db6dd52f25ba66c9656ca0254a1e56485ed3c11..f9f1457e4d078eefb271a0140d232a654c654a18 100644 (file)
@@ -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'))) {
@@ -103,11 +113,18 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
                // Please run the installation script (maybe again)
                die(DIE_RUN_INSTALL_MYSQL);
        }
-} elseif ((!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!
        echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
 }
 
+// Set dummy $_CONFIG array
+$_CONFIG = array(
+       'code_length' => 0,
+       'patch_level' => 0,
+       'last_update' => time()
+);
+
 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory
@@ -129,15 +146,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
                        // Is it a valid resource?
                        if ($db === true) {
-                               // Remove MySQL array from namespace
+                               // This is required for extension 'optimize' to work
                                define('__DB_NAME', $MySQL['dbase']);
+
+                               // Remove MySQL array from namespace
                                unset($MySQL);
 
                                // Load configuration stuff
-                               $_CONFIG = LOAD_CONFIG();
-
-                               // Initialize include-file-pool
-                               $INC_POOL = array();
+                               $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
 
                                // Load "databases" aka static arrays
                                require_once(PATH."inc/databases.php");
@@ -151,12 +167,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // Run daily reset
                                require_once(PATH."inc/check-reset.php");
 
-                               // Create missing configuration file
-                               if (!function_exists('GET_CURR_THEME')) {
-                                       // Load dummy theme functions
-                                       require_once(PATH."inc/theme-dummy.php");
-                               } // END - if
-
                                // Load admin include file if he is admin
                                if (IS_ADMIN()) {
                                        // Administrative functions
@@ -176,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";
@@ -191,7 +198,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        } elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) {
                                                // Set 'what' value to 'welcome' in guest and member menu
                                                $GLOBALS['what'] = "welcome";
-                                               if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+                                               if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
                                        } else {
                                                // Anything else like begging link
                                                $GLOBALS['what'] = "";
@@ -208,7 +215,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                unset($dummy);
 
                                // Shall we activate the exchange?
-                               if ($_CONFIG['activate_xchange'] > 0) activateExchange();
+                               if (getConfig('activate_xchange') > 0) activateExchange();
 
                                // Is the extension sql_patches installed and at least 0.3.6?
                                if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
@@ -249,27 +256,16 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        // Include neccessary functions for installation //
        ///////////////////////////////////////////////////
 
-       // Set CONFIG array
-       $_CONFIG = array(
-               'code_length' => 0
-       );
-
        // 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
@@ -289,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")) {