Global variables rewritten

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 697481ec2e48674f0d6af19a757eb61591047296..fdc059a8fb27904640f3cce2499486a0081d2199 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 define('DEBUG_SQL', false);
 
 // Non-database functions
-LOAD_INC_ONCE("inc/functions.php");
+require("inc/functions.php");
 
 // Filter functions
 LOAD_INC_ONCE("inc/filters.php");  
@@ -71,14 +71,10 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
        // 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.");
+               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.");
+               // No debug extension found, so regular output
+               debug_report_bug($msg);
        }
 }
 
@@ -97,7 +93,7 @@ function __SHUTDOWN_HOOK () {
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link
-               addFatalMessage(NO_DB_LINK);
+               addFatalMessage(getMessage('NO_DB_LINK'));
        }
 }
 
@@ -107,17 +103,17 @@ 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
-       OUTPUT_HTML("<strong>{!LANG_WARNING!}:</strong> ");
+       OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
        if (isBooleanConstantAndTrue('mxchange_installed')) {
                // You have changed my configuration file!
-               mxchange_die("{!DIE_CONFIG_CHANGED_YOU!}");
+               mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
        } else {
                // Please run the installation script (maybe again)
-               mxchange_die("{!DIE_RUN_INSTALL_MYSQL!}");
+               mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
        }
 } elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // 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
@@ -127,9 +123,8 @@ $_CONFIG = array(
        'last_update' => time()
 );
 
-// Init important $header variable
-global $header;
-$header = 0;
+// Set important header_sent
+$GLOBALS['header_sent'] = 0;
 
 // Init fatal messages
 global $FATAL;
@@ -163,7 +158,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                unset($MySQL);
 
                                // Load configuration stuff
-                               $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
+                               mergeConfig(LOAD_CONFIG());
 
                                // Load "databases" aka static arrays
                                LOAD_INC_ONCE("inc/databases.php");
@@ -186,7 +181,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                //* DEBUG: */ die();
 
                                // Get all values
-                               if (($CSS != 1) && ($CSS != -1)) {
+                               if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
                                        if (empty($GLOBALS['module']))  $GLOBALS['module'] = "empty";
                                        if (empty($GLOBALS['what']))    $GLOBALS['what']   = GET_WHAT($GLOBALS['module']);
                                        if (empty($GLOBALS['action']))  $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
@@ -201,7 +196,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
                                // Set default 'what' value
                                //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
-                               if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
+                               if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
                                        if ($GLOBALS['module'] == "admin") {
                                                // Set 'action' value to 'login' in admin menu
                                                $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
@@ -216,7 +211,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                } // END - if
 
                                // Update sending pool
-                               if (($CSS != "1") && ($CSS != "-1")) LOAD_INC_ONCE("inc/pool-update.php"); // Sends out mails in configureable steps
+                               if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) LOAD_INC_ONCE("inc/pool-update.php"); // Sends out mails in configureable steps
 
                                // Load all active extension including language files when not upgrading.
                                // Check module for testing and count one click
@@ -267,7 +262,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        ///////////////////////////////////////////////////
 
        // Set other missing variables
-       if (!isset($CSS)) $CSS = "0";
+       if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
        $link = false; // No database link by default
 
        // Include required files
@@ -275,7 +270,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        LOAD_INC_ONCE("inc/session.php");
 
        // Check if we are in installation routine
-       if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+       if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if
@@ -295,7 +290,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        } // END - if
 }
 
-if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
        // One or more fatal error(s) occur during connect...
        LOAD_INC_ONCE("inc/header.php");
        LOAD_INC_ONCE("inc/fatal_errors.php");