Logic fixed and comments improved

[mailer.git] / inc / filter / online_filter.php

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index d31c793c63484772b2885b102f6bbc04bfb799ed..e24b674fd374d86103c5f908e1e8b9e99d06aaff 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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,7 +41,7 @@ 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)) {
@@ -56,21 +56,15 @@ function FILTER_UPDATE_ONLINE_LIST ($data) {
        } // 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());
 
        // 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
@@ -99,8 +93,8 @@ LIMIT 1",
                        getModule(),
                        $action,
                        getWhat(),
-                       makeDatabaseUserId($userid),
-                       makeDatabaseUserId(determineReferalId()),
+                       convertZeroToNull($userid),
+                       convertZeroToNull(determineReferralId()),
                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),
@@ -108,13 +102,13 @@ LIMIT 1",
                ), __FUNCTION__, __LINE__);
        } else {
                // No entry does exists so we simply add it!
-               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')",
+               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(),
                                $action,
                                getWhat(),
-                               makeDatabaseUserId($userid),
-                               makeDatabaseUserId(determineReferalId()),
+                               convertZeroToNull($userid),
+                               convertZeroToNull(determineReferralId()),
                                $isMember,
                                $isAdmin,
                                session_id(),
@@ -130,7 +124,7 @@ LIMIT 1",
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // [EOF]