X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=5850e441720b2acc798e9fc2345df95222e01025;hp=41b049938a9696da4f5f66f0e3fe7206129a7881;hb=c45b1827a16928c65ecc1aea6a9d7a504c4874d4;hpb=61bddb167e29e7275f5a1c9fa8cb80431fa5ee6f

diff --git a/modules.php b/modules.php
index 41b049938a..5850e44172 100644
--- a/modules.php
+++ b/modules.php
@@ -55,22 +55,18 @@ $GLOBALS['module'] = htmlentities(strip_tags($_GET['module']), ENT_QUOTES);
 require ("inc/config.php");
 
 // Check if logged in
-if (IS_LOGGED_IN())
-{
+if (IS_LOGGED_IN()) {
 	// 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=%d 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)
-	{
+	if (SQL_NUMROWS($result) == 1) {
 		// Load surname and family's name and build the username
 		list($s, $f) = SQL_FETCHROW($result);
 		$username = $s." ".$f;
 
 		// Update only cookies and no login data!
 		UPDATE_LOGIN_DATA(false);
-	}
-	 else
-	{
+	} else {
 
 		// Hmmm, logged in and no valid cookies???
 		$username = "<I>"._UNKNOWN."</I>";
@@ -78,13 +74,9 @@ if (IS_LOGGED_IN())
 
 	// Free memory
 	SQL_FREERESULT($result);
-}
- elseif (IS_ADMIN())
-{
+} elseif (IS_ADMIN()) {
 	$username = _ADMIN;
-}
- else
-{
+} else {
 	// He's a guest, hello there... ;-)
 	$username = _GUEST;
 }
@@ -94,13 +86,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 ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['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))
-{
+} elseif (($link) && ($db) && (sizeof($FATAL) == 0)) {
 	// Did we found the module listed in allowed modules and are we successfully connected?
 	$check = CHECK_MODULE($GLOBALS['module']);
 	switch ($check)
@@ -112,18 +101,13 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
 		define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $GLOBALS['module']));
 
 		// Does the module exists on local file system?
-		if (((file_exists(__MODULE)) || (!empty($URL))) && (sizeof($FATAL) == 0))
-		{
+		if (((file_exists(__MODULE)) && (is_readable(__MODULE))) && (sizeof($FATAL) == 0)) {
 			// Module is valid, active and located on the local disc...
 			$MOD_VALID = true;
-		}
-		 elseif (!empty($URL))
-		{
+		} elseif (!empty($URL)) {
 			// An URL was specified so we load the de-referrer module
-			include (PATH."inc/loader.php");
-		}
-		 elseif (sizeof($FATAL) == 0)
-		{
+			LOAD_URL(DEREFERER($URL));
+		} elseif (sizeof($FATAL) == 0) {
 			ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
 		}
 		break;
@@ -152,8 +136,7 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
 	ADD_FATAL(MYSQL_ERRORS);
 }
 
-if ($MOD_VALID)
-{
+if ($MOD_VALID) {
 	/////////////////////////////////////////////
 	// Main including line DO NOT REMOVE/EDIT! //
 	/////////////////////////////////////////////