Slogan added, logout added to ext-sponsor:

[mailer.git] / inc / libs / online_functions.php

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 562ff0123e6bed23cd2689ad413e10cf05a9dd63..ec0dffee1fc24f135b9b8c0d9608275d24f1d796 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Filter for updates/extends on the online list
 function FILTER_UPDATE_ONLINE_LIST () {
@@ -55,24 +55,22 @@ function FILTER_UPDATE_ONLINE_LIST () {
 
        // Initialize variables
        $userid = '0';
-       $MEM = 'N';
-       $ADMIN = 'N';
+       $isMember = 'N';
+       $isAdmin = 'N';
+       $action = getActionFromModuleWhat(getModule(), getWhat());
 
        // Valid userid?
-       if ((isMemberIdSet()) && (getMemberId() > 0) && (isMember())) {
+       if (isMember()) {
                // Is valid user
                $userid = getMemberId();
-               $MEM = 'Y';
+               $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__);
@@ -97,12 +95,12 @@ WHERE
 LIMIT 1",
                array(
                        getModule(),
-                       getAction(),
+                       $action,
                        getWhat(),
                        $userid,
-                       $rid,
-                       $MEM,
-                       $ADMIN,
+                       makeDatabaseUserId(determineReferalId()),
+                       $isMember,
+                       $isAdmin,
                        detectRemoteAddr(),
                        session_id()
                ), __FUNCTION__, __LINE__);
@@ -111,12 +109,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(determineReferalId()),
+                               $isMember,
+                               $isAdmin,
                                session_id(),
                                detectRemoteAddr()
                        ), __FUNCTION__, __LINE__);