X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fonline_functions.php;h=85c04334cd45cec88542e884df44415176564c44;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=fb7dfc7c89fec524e0bd8d56c46cbf2e4470e11b;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index fb7dfc7c89..85c04334cd 100644
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/18/2008 *
- * ================                             Last change: 12/18/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 12/18/2008 *
+ * ===================                          Last change: 12/18/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : online_functions.php                             *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Filter for updates/extends on the online list
 function FILTER_UPDATE_ONLINE_LIST () {
@@ -49,29 +48,27 @@ function FILTER_UPDATE_ONLINE_LIST () {
 	// Empty session?
 	if (session_id() == '') {
 		// This is invalid here!
-		debug_report_bug('Invalid session.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Invalid session.');
 	} // END - if
 
 	// Initialize variables
-	$userid = 0;
-	$MEM = 'N';
-	$ADMIN = 'N';
+	$userid = '0';
+	$isMember = 'N';
+	$isAdmin = 'N';
+	$action = getActionFromModuleWhat(getModule(), getWhat());
 
 	// Valid userid?
-	if ((isUserIdSet()) && (getUserId() > 0) && (isMember())) {
+	if (isMember()) {
 		// Is valid user
-		$userid = getUserId();
-		$MEM = 'Y';
+		$userid = getMemberId();
+		$isMember = 'Y';
 	} // END - if
 
 	if (isAdmin()) {
 		// Is administrator
-		$ADMIN = 'Y';
+		$isAdmin = 'Y';
 	} // END - if
 
-	// Get refid
-	$rid = determineReferalId();
-
 	// Now search for the user
 	$result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_online` WHERE `sid`='%s' LIMIT 1",
 		array(session_id()), __FUNCTION__, __LINE__);
@@ -96,12 +93,12 @@ WHERE
 LIMIT 1",
 		array(
 			getModule(),
-			getAction(),
+			$action,
 			getWhat(),
-			$userid,
-			$rid,
-			$MEM,
-			$ADMIN,
+			makeDatabaseUserId($userid),
+			makeDatabaseUserId(determineReferalId()),
+			$isMember,
+			$isAdmin,
 			detectRemoteAddr(),
 			session_id()
 		), __FUNCTION__, __LINE__);
@@ -110,12 +107,12 @@ LIMIT 1",
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_online` (`module`, `action`, `what`, `userid`, `refid`, `is_member`, `is_admin`, `timestamp`, `sid`, `ip`) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
 			array(
 				getModule(),
-				getAction(),
+				$action,
 				getWhat(),
-				$userid,
-				$rid,
-				$MEM,
-				$ADMIN,
+				makeDatabaseUserId($userid),
+				makeDatabaseUserId(determineReferalId()),
+				$isMember,
+				$isAdmin,
 				session_id(),
 				detectRemoteAddr()
 			), __FUNCTION__, __LINE__);
@@ -125,7 +122,7 @@ LIMIT 1",
 	SQL_FREERESULT($result);
 
 	// Purge old entries
-	SQL_QUERY("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_online` WHERE `timestamp` <= (UNIX_TIMESTAMP() - {?online_timeout?})", __FUNCTION__, __LINE__);
+	SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_online` WHERE `timestamp` <= (UNIX_TIMESTAMP() - {?online_timeout?})', __FUNCTION__, __LINE__);
 }
 
 // [EOF]