Fixed a lot typos, thanks to profi-concept

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 697481ec2e48674f0d6af19a757eb61591047296..23fd43926c133639d01bc736ac5a69797251c457 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
@@ -163,7 +159,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");