Two tickets resolved (57/89)

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index b94a2a0414c8bec6be55e2c3baa7f1331227d4ca..bee4beae2c00a70d0f97698017f0e3292245c17d 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -35,7 +35,7 @@
 //xdebug_start_trace();
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action, $startTime;
@@ -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
@@ -70,11 +70,11 @@ if (IS_MEMBER()) {
                // Additionally admin?
                if (IS_ADMIN()) {
                        // Add it
-                       $username .= " ("._ADMIN_SHORT.")";
+                       $username .= " ({!_ADMIN_SHORT!})";
                } // END - if
        } else {
                // Hmmm, logged in and no valid userid?
-               $username = "<em>"._UNKNOWN."</em>";
+               $username = "<em>{!_UNKNOWN!}</em>";
 
                // Destroy session
                destroy_user_session();
@@ -94,14 +94,17 @@ if (IS_MEMBER()) {
 }
 
 // The header file
-include (PATH."inc/header.php");
+LOAD_INC_ONCE("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)) {
+       // Construct module name
+       define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
+
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
        switch ($check)
@@ -109,9 +112,6 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        case "admin_only":
        case "mem_only":
        case "done":
-               // Construct module name
-               define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
-
                // Does the module exists on local file system?
                if ((FILE_READABLE(__MODULE)) && (getTotalFatalErrors() == 0)) {
                        // Module is valid, active and located on the local disc...
@@ -129,7 +129,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
                break;
 
        case "locked":
-               if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
+               if (!FILE_READABLE(__MODULE)) {
                        // Module does addionally not exists
                        addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
                } // END - if
@@ -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'))) {
@@ -154,11 +154,11 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
        /////////////////////////////////////////////
        //
        // Everything is okay so we can load the module
-       include (__MODULE);
+       LOAD_INC_ONCE(__MODULE);
 } // END - if
 
 // Next-to-end add the footer
-include (PATH."inc/footer.php");
+LOAD_INC_ONCE("inc/footer.php");
 
 //
 ?>