Fixes for a lot bug tickets. (Sorry for lame comment)

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index da08bc735fc55e67f139b873c7f193345796a599..f8c1a88e383c282ba09f5e0b85ddaccd413db36b 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
@@ -98,7 +98,7 @@ include (PATH."inc/header.php");
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
-if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
+if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin
        ADD_FATAL(LANG_DOWN_MAINTAINCE);
 } elseif (($link) && ($db) && (sizeof($FATAL) == 0)) {
@@ -148,7 +148,7 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
        ADD_FATAL(MYSQL_ERRORS);
 }
 
-if ($MOD_VALID) {
+if (($MOD_VALID) && (defined('__MODULE'))) {
        /////////////////////////////////////////////
        // Main including line DO NOT REMOVE/EDIT! //
        /////////////////////////////////////////////