X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=modules.php;h=ae7948fe925fecc02de1fd34cbee5d45cf6cb9ab;hb=a5d4f2529bcfab3bee7816f824e73affcd3c473b;hp=a5f7420f61710ef98ad14bcc6d3a421a4e7fce04;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git

diff --git a/modules.php b/modules.php
index a5f7420f61..ae7948fe92 100644
--- a/modules.php
+++ b/modules.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Hauptladedatei. Laedt alle benoetigten Dateien   *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -47,7 +47,6 @@ $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['output_mode'] = 0;
 $GLOBALS['what']   = "";
 $GLOBALS['action'] = "";
-$GLOBALS['userid'] = 0;
 $GLOBALS['module'] = "";
 
 // Needed include files
@@ -60,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);
@@ -79,7 +78,7 @@ if (IS_MEMBER()) {
 		destroy_user_session();
 
 		// Kill userid
-		$GLOBALS['userid'] = 0;
+		setUserId(0);
 	}
 
 	// Free memory