Previous fix fixed, a lot constants rewritten (unfinished)

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 913b66e169e4638c212fcad7ed3ccca62c397ea7..4215f5c97c175d4d0b288aaf0730e0a2baac330d 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -60,7 +60,7 @@ require("inc/config.php");
 // Check if logged in
 if (IS_MEMBER()) {
        // Is still logged in so we welcome him with his name
-       $result = SQL_QUERY_ESC("SELECT surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
         array($GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load surname and family's name and build the username
@@ -94,13 +94,13 @@ if (IS_MEMBER()) {
 }
 
 // The header file
-include (PATH."inc/header.php");
+require_once(PATH."inc/header.php");
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin
-       addFatalMessage(LANG_DOWN_MAINTAINCE);
+       addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
 } elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
@@ -145,7 +145,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        }
 } elseif (getTotalFatalErrors() == 0) {
        // MySQL problems!
-       addFatalMessage(MYSQL_ERRORS);
+       addFatalMessage(getMessage('MYSQL_ERRORS'));
 }
 
 if (($MOD_VALID) && (defined('__MODULE'))) {
@@ -158,7 +158,7 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
 } // END - if
 
 // Next-to-end add the footer
-include (PATH."inc/footer.php");
+require_once(PATH."inc/footer.php");
 
 //
 ?>