Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index ef247614edc166e47acd83f2935969433e190deb..c9e95630ec82e0f7b68ea34c882fa7fcae3862de 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -107,17 +107,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
-       echo "<strong>".LANG_WARNING.":</strong> ";
+       OUTPUT_HTML("<strong>{!LANG_WARNING!}:</strong> ");
        if (isBooleanConstantAndTrue('mxchange_installed')) {
                // You have changed my configuration file!
-               die(DIE_CONFIG_CHANGED_YOU);
+               mxchange_die("{!DIE_CONFIG_CHANGED_YOU!}");
        } else {
                // Please run the installation script (maybe again)
-               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!!!
-       echo "<div>".LANG_WARNING.":</div> ".WARN_NULL_PASSWORD;
+       OUTPUT_HTML("<div>{!LANG_WARNING!}:</div> {!WARN_NULL_PASSWORD!}");
 }
 
 // Set dummy $_CONFIG array
@@ -200,7 +200,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                RUN_FILTER('init');
 
                                // Set default 'what' value
-                               //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
+                               //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
                                if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
                                        if ($GLOBALS['module'] == "admin") {
                                                // Set 'action' value to 'login' in admin menu
@@ -241,25 +241,25 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                }
                        } else {
                                // Add language system
-                               include (PATH."inc/language.php");
+                               require_once(PATH."inc/language.php");
 
                                // Wrong database?
-                               addFatalMessage(WRONG_DB_SELECTED);
+                               addFatalMessage(getMessage('WRONG_DB_SELECTED'));
                        }
                } else {
                        // Add language system
-                       include (PATH."inc/language.php");
+                       require_once(PATH."inc/language.php");
 
                        // No link to database!
-                       addFatalMessage(NO_DB_LINK);
+                       addFatalMessage(getMessage('NO_DB_LINK'));
                        $db = false;
                }
        } else {
                // Add language system
-               include (PATH."inc/language.php");
+               require_once(PATH."inc/language.php");
 
                // Maybe you forgot to enter your MySQL data?
-               addFatalMessage(MYSQL_DATA_MISSING);
+               addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
        }
 } else {
        ///////////////////////////////////////////////////
@@ -284,22 +284,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
-                       addFatalMessage(CONFIG_IS_WRITE_PROTECTED);
+                       addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
-                       addFatalMessage(DUMMY_IS_WRITE_PROTECTED);
+                       addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
-                       addFatalMessage(SECRET_IS_WRITE_PROTECTED);
+                       addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
                } // END - if
        } // END - if
 }
 
 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");
-       include (PATH."inc/footer.php");
+       require_once(PATH."inc/header.php");
+       require_once(PATH."inc/fatal_errors.php");
+       require_once(PATH."inc/footer.php");
 } // END - if
 
 //