X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter%2Fonline_filter.php;h=31c22ee1174f3a28db856ef4b8f07ed8d70eda17;hb=6bd47661d7ec406cd276f0835364b1e3f933d6c8;hp=d31c793c63484772b2885b102f6bbc04bfb799ed;hpb=964a3b539e335f6d70e7779630fd3d25fd38398d;p=mailer.git

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index d31c793c63..31c22ee117 100644
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,36 +41,31 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Filter for updates/extends on the online list
-function FILTER_UPDATE_ONLINE_LIST ($data) {
+function FILTER_UPDATE_ONLINE_LIST ($filterData) {
 	// Do not update online list when extension is deactivated
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-	if (!isExtensionActive('online', true)) {
+	if (!isExtensionActive('online')) {
 		// Extension not active
-		return;
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension ext-online is not active.');
+		return $filterData;
 	} // END - if
 
 	// Empty session?
 	if (session_id() == '') {
 		// This is invalid here!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Invalid session.');
+		reportBug(__FUNCTION__, __LINE__, 'Invalid session.');
 	} // END - if
 
 	// Initialize variables
-	$userid = '0';
-	$isMember = 'N';
-	$isAdmin = 'N';
-	$action = getActionFromModuleWhat(getModule(), getWhat());
+	$userid   = NULL;
+	$isMember = convertBooleanToYesNo(isMember());
+	$isAdmin  = convertBooleanToYesNo(isAdmin());
+	$action   = getActionFromModuleWhat(getModule(), getWhat(FALSE));
 
 	// Valid userid?
 	if (isMember()) {
-		// Is valid user
+		// Is valid user, so get the userid
 		$userid = getMemberId();
-		$isMember = 'Y';
-	} // END - if
-
-	if (isAdmin()) {
-		// Is administrator
-		$isAdmin = 'Y';
 	} // END - if
 
 	// Now search for the user
@@ -98,9 +93,9 @@ LIMIT 1",
 		array(
 			getModule(),
 			$action,
-			getWhat(),
-			makeDatabaseUserId($userid),
-			makeDatabaseUserId(determineReferalId()),
+			getWhat(FALSE),
+			convertZeroToNull($userid),
+			convertZeroToNull(determineReferralId()),
 			$isMember,
 			$isAdmin,
 			detectRemoteAddr(),
@@ -112,9 +107,9 @@ LIMIT 1",
 			array(
 				getModule(),
 				$action,
-				getWhat(),
-				makeDatabaseUserId($userid),
-				makeDatabaseUserId(determineReferalId()),
+				getWhat(FALSE),
+				convertZeroToNull($userid),
+				convertZeroToNull(determineReferralId()),
 				$isMember,
 				$isAdmin,
 				session_id(),
@@ -130,7 +125,7 @@ LIMIT 1",
 
 	// Return data
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-	return $data;
+	return $filterData;
 }
 
 // [EOF]