X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=b94a2a0414c8bec6be55e2c3baa7f1331227d4ca;hp=53a8e0ff41e62c6d3b18344e89625acac042623f;hb=3608f72d51e8126720024704398cf738e61f890b;hpb=43885129ac24cee5545a8a5ad51e90aa182fdf46

diff --git a/modules.php b/modules.php
index 53a8e0ff41..b94a2a0414 100644
--- a/modules.php
+++ b/modules.php
@@ -31,11 +31,11 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// APD call (if you have this apache extension and want to debug this script for us)
-//apd_set_pprof_trace();
+// XDEBUG call
+//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_once("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action, $startTime;
@@ -44,37 +44,49 @@ $CSS = 0;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['userid'] = 0;
 
+// Fix missing module to "index"
+if (empty($_GET['module'])) $_GET['module'] = "index";
+
+// Secure action/what if present
 if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
 if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
-if (empty($_GET['module'])) $_GET['module'] = "index";
 
 // Secure the module name (very important line!)
-$GLOBALS['module'] = htmlentities(strip_tags($_GET['module']), ENT_QUOTES);
+$GLOBALS['module'] = secureString($_GET['module']);
 
 // Needed include files
-require ("inc/config.php");
+require("inc/config.php");
 
 // Check if logged in
-if (IS_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
 		list($s, $f) = SQL_FETCHROW($result);
 		$username = $s." ".$f;
 
-		// Update only cookies and no login data!
-		UPDATE_LOGIN_DATA(false);
+		// Additionally admin?
+		if (IS_ADMIN()) {
+			// Add it
+			$username .= " ("._ADMIN_SHORT.")";
+		} // END - if
 	} else {
+		// Hmmm, logged in and no valid userid?
+		$username = "<em>"._UNKNOWN."</em>";
 
-		// Hmmm, logged in and no valid cookies???
-		$username = "<I>"._UNKNOWN."</I>";
+		// Destroy session
+		destroy_user_session();
+
+		// Kill userid
+		$GLOBALS['userid'] = 0;
 	}
 
 	// Free memory
 	SQL_FREERESULT($result);
 } elseif (IS_ADMIN()) {
+	// Admin is there
 	$username = _ADMIN;
 } else {
 	// He's a guest, hello there... ;-)
@@ -86,13 +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)
@@ -101,58 +110,52 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
 	case "mem_only":
 	case "done":
 		// Construct module name
-		define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $GLOBALS['module']));
+		define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
 
 		// Does the module exists on local file system?
-		if (((file_exists(__MODULE)) || (!empty($URL))) && (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))
-		{
+		} elseif (!empty($URL)) {
 			// An URL was specified so we load the de-referrer module
-			include (PATH."inc/loader.php");
-		}
-		 elseif (sizeof($FATAL) == 0)
-		{
-			ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+			LOAD_URL(DEREFERER($URL));
+		} 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_exists(PATH."inc/modules/".$GLOBALS['module'].".php"))
-		{
+		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);
-		}
-		ADD_FATAL(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
+			addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+		} // END - if
+
+		// Add fatal message
+		addFatalMessage(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
 		break;
 
 	default:
-		ADD_FATAL(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
+		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
+		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! //
 	/////////////////////////////////////////////
 	//
 	// Everything is okay so we can load the module
 	include (__MODULE);
-}
+} // END - if
 
 // Next-to-end add the footer
 include (PATH."inc/footer.php");