Some internal TODOs fixed, rewrites to script inclusion

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index efe013a2784a79446800c94fe1d44809ae078720..ef247614edc166e47acd83f2935969433e190deb 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,11 +40,8 @@ if (!defined('__SECURITY')) {
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
-// Load database library
-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");  
@@ -55,6 +52,9 @@ require_once(PATH."inc/mysql-manager.php");
 // Load extensions and language
 require_once(PATH."inc/extensions.php");
 
+// Load database library
+require_once(PATH."inc/db/lib.php");
+
 // Error handler function
 function __errorHandler ($errno, $errstr, $errfile, $errline) {
        // Construct message
@@ -70,10 +70,12 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
 
        // Output message to user and die
        if (EXT_IS_ACTIVE("debug")) {
-               // Debug extension found! :-)
-               die("Error message written to debug.log. Please try to call <a href=\"".URL."\">the main page</a> to continue.");
+               // 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
+               // @TODO Find a way to rewrite debug_print_backtrace() so we can maybe
+               // @TODO (?) rewrite this to mxchange_die()
                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.");
@@ -95,7 +97,7 @@ function __SHUTDOWN_HOOK () {
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link
-               ADD_FATAL(NO_DB_LINK);
+               addFatalMessage(NO_DB_LINK);
        }
 }
 
@@ -105,7 +107,7 @@ 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'))) {
        // No login entered and outside installation mode
-       echo "<STRONG>".LANG_WARNING.":</STRONG> ";
+       echo "<strong>".LANG_WARNING.":</strong> ";
        if (isBooleanConstantAndTrue('mxchange_installed')) {
                // You have changed my configuration file!
                die(DIE_CONFIG_CHANGED_YOU);
@@ -115,7 +117,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
        }
 } 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;
+       echo "<div>".LANG_WARNING.":</div> ".WARN_NULL_PASSWORD;
 }
 
 // Set dummy $_CONFIG array
@@ -125,6 +127,14 @@ $_CONFIG = array(
        'last_update' => time()
 );
 
+// Init important $header variable
+global $header;
+$header = 0;
+
+// Init fatal messages
+global $FATAL;
+$FATAL = array();
+
 // 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
@@ -234,14 +244,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                include (PATH."inc/language.php");
 
                                // Wrong database?
-                               ADD_FATAL(WRONG_DB_SELECTED);
+                               addFatalMessage(WRONG_DB_SELECTED);
                        }
                } else {
                        // Add language system
                        include (PATH."inc/language.php");
 
                        // No link to database!
-                       ADD_FATAL(NO_DB_LINK);
+                       addFatalMessage(NO_DB_LINK);
                        $db = false;
                }
        } else {
@@ -249,7 +259,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                include (PATH."inc/language.php");
 
                // Maybe you forgot to enter your MySQL data?
-               ADD_FATAL(MYSQL_DATA_MISSING);
+               addFatalMessage(MYSQL_DATA_MISSING);
        }
 } else {
        ///////////////////////////////////////////////////
@@ -257,6 +267,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        ///////////////////////////////////////////////////
 
        // Set other missing variables
+       if (!isset($CSS)) $CSS = "0";
        $link = false; // No database link by default
 
        // Include required files
@@ -264,8 +275,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        require_once(PATH."inc/session.php");
 
        // 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
@@ -274,26 +284,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
-                       ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
+                       addFatalMessage(CONFIG_IS_WRITE_PROTECTED);
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
-                       ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
+                       addFatalMessage(DUMMY_IS_WRITE_PROTECTED);
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
-                       ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
+                       addFatalMessage(SECRET_IS_WRITE_PROTECTED);
                } // END - if
        } // END - if
 }
 
-// Any fatal messages?
-if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
        // One or more fatal error(s) occur during connect...
        include (PATH."inc/header.php");
        include (PATH."inc/fatal_errors.php");
-       unset($FATAL);
        include (PATH."inc/footer.php");
-       exit;
 } // END - if
 
 //