X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=f9ecc4756346533bde8646f7a1b9324550eb2d6a;hp=9cdeacb18ad9d6b635626caf9cd1152ca0b2124a;hb=64d07c28338c2b08687ff394235101c79cd3077f;hpb=9b87babf90b27658be4a1cef2c0465e2ce9ed681

diff --git a/modules.php b/modules.php
index 9cdeacb18a..f9ecc47563 100644
--- a/modules.php
+++ b/modules.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Hauptladedatei. Laedt alle benoetigten Dateien   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -42,7 +47,6 @@ $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['output_mode'] = 0;
 $GLOBALS['what']   = "";
 $GLOBALS['action'] = "";
-$GLOBALS['userid'] = 0;
 $GLOBALS['module'] = "";
 
 // Needed include files
@@ -55,7 +59,7 @@ if (!REQUEST_ISSET_GET(('module'))) REQUEST_SET_GET('module', "index");
 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",
-	 array($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Load surname and family's name and build the username
 		list($s, $f) = SQL_FETCHROW($result);
@@ -74,7 +78,7 @@ if (IS_MEMBER()) {
 		destroy_user_session();
 
 		// Kill userid
-		$GLOBALS['userid'] = 0;
+		setUserId(0);
 	}
 
 	// Free memory
@@ -100,7 +104,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
 	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']);
+	$check = checkModulePermissions($GLOBALS['module']);
 	switch ($check)
 	{
 	case "admin_only":