X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=913b66e169e4638c212fcad7ed3ccca62c397ea7;hp=da08bc735fc55e67f139b873c7f193345796a599;hb=cca98f57dff720b174d21d071cee8303462485d7;hpb=d798a412acb8c1263933bd7f7a0fd9aa251495a7

diff --git a/modules.php b/modules.php
index da08bc735f..913b66e169 100644
--- 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
@@ -74,7 +74,7 @@ if (IS_MEMBER()) {
 		} // END - if
 	} else {
 		// Hmmm, logged in and no valid userid?
-		$username = "<I>"._UNKNOWN."</I>";
+		$username = "<em>"._UNKNOWN."</em>";
 
 		// Destroy session
 		destroy_user_session();
@@ -98,10 +98,10 @@ 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)) {
+	addFatalMessage(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']);
 	switch ($check)
@@ -113,42 +113,42 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
 		define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
 
 		// Does the module exists on local file system?
-		if ((FILE_READABLE(__MODULE)) && (sizeof($FATAL) == 0)) {
+		if ((FILE_READABLE(__MODULE)) && (getTotalFatalErrors() == 0)) {
 			// Module is valid, active and located on the local disc...
 			$MOD_VALID = true;
 		} elseif (!empty($URL)) {
 			// An URL was specified so we load the de-referrer module
 			LOAD_URL(DEREFERER($URL));
-		} elseif (sizeof($FATAL) == 0) {
-			ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+		} elseif (getTotalFatalErrors() == 0) {
+			addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
 		}
 		break;
 
 	case "404":
-		ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+		addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
 		break;
 
 	case "locked":
 		if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
 			// Module does addionally not exists
-			ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+			addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
 		} // END - if
 
 		// Add fatal message
-		ADD_FATAL(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
+		addFatalMessage(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
 		break;
 
 	default:
 		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
-		ADD_FATAL(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
+		addFatalMessage(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
 		break;
 	}
-} elseif (sizeof($FATAL) == 0) {
+} elseif (getTotalFatalErrors() == 0) {
 	// MySQL problems!
-	ADD_FATAL(MYSQL_ERRORS);
+	addFatalMessage(MYSQL_ERRORS);
 }
 
-if ($MOD_VALID) {
+if (($MOD_VALID) && (defined('__MODULE'))) {
 	/////////////////////////////////////////////
 	// Main including line DO NOT REMOVE/EDIT! //
 	/////////////////////////////////////////////