Required fix for NULL vs. 0 in user_points

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

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index d31c793c63484772b2885b102f6bbc04bfb799ed..869e89f444be2cada73f481cebf4eb2bb5c7f87a 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -57,20 +57,14 @@ function FILTER_UPDATE_ONLINE_LIST ($data) {
 
        // Initialize variables
        $userid = '0';
 
        // Initialize variables
        $userid = '0';

-       $isMember = 'N';
-       $isAdmin = 'N';
-       $action = getActionFromModuleWhat(getModule(), getWhat());
+       $isMember = convertBooleanToYesNo(isMember());
+       $isAdmin  = convertBooleanToYesNo(isAdmin());
+       $action   = getActionFromModuleWhat(getModule(), getWhat());

 
        // Valid userid?
        if (isMember()) {
 
        // Valid userid?
        if (isMember()) {

-               // Is valid user
+               // Is valid user, so get the userid

                $userid = getMemberId();
                $userid = getMemberId();

-               $isMember = 'Y';
-       } // END - if
-
-       if (isAdmin()) {
-               // Is administrator
-               $isAdmin = 'Y';

        } // END - if
 
        // Now search for the user
        } // END - if
 
        // Now search for the user


@@ -99,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(),


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

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

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