A lot has been rewritten, ext-teams added, ext-forced continued:

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

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index 68e73929e5a53d8fc4e6b9fbce7e3ea8f874c2d9..710e76d92137df2b57a122d9fa5e7873d19212ec 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Filter for updates/extends on the online list
 } // 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)) {
        // Do not update online list when extension is deactivated
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isExtensionActive('online', true)) {


@@ -56,7 +56,7 @@ function FILTER_UPDATE_ONLINE_LIST ($data) {
        } // END - if
 
        // Initialize variables
        } // END - if
 
        // Initialize variables

-       $userid = '0';
+       $userid   = NULL;

        $isMember = convertBooleanToYesNo(isMember());
        $isAdmin  = convertBooleanToYesNo(isAdmin());
        $action   = getActionFromModuleWhat(getModule(), getWhat());
        $isMember = convertBooleanToYesNo(isMember());
        $isAdmin  = convertBooleanToYesNo(isAdmin());
        $action   = getActionFromModuleWhat(getModule(), getWhat());


@@ -93,8 +93,8 @@ LIMIT 1",
                        getModule(),
                        $action,
                        getWhat(),
                        getModule(),
                        $action,
                        getWhat(),

-                       makeDatabaseUserId($userid),
-                       makeDatabaseUserId(determineReferalId()),
+                       makeZeroToNull($userid),
+                       makeZeroToNull(determineReferalId()),

                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),
                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),


@@ -102,13 +102,13 @@ LIMIT 1",
                ), __FUNCTION__, __LINE__);
        } else {
                // No entry does exists so we simply add it!
                ), __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(),
                        array(
                                getModule(),
                                $action,
                                getWhat(),

-                               makeDatabaseUserId($userid),
-                               makeDatabaseUserId(determineReferalId()),
+                               makeZeroToNull($userid),
+                               makeZeroToNull(determineReferalId()),

                                $isMember,
                                $isAdmin,
                                session_id(),
                                $isMember,
                                $isAdmin,
                                session_id(),


@@ -124,7 +124,7 @@ LIMIT 1",
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');

-       return $data;
+       return $filterData;

 }
 
 // [EOF]
 }
 
 // [EOF]