Code cleanup, more usage of API functions

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

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 479976c181162b71e906188e3a4b749abd11c015..a989e1f2a29be41dd08731557fc402900e5a277d 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -57,9 +55,10 @@ function FILTER_UPDATE_ONLINE_LIST () {
        $userid = '0';
        $isMember = 'N';
        $isAdmin = 'N';
+       $action = getActionFromModuleWhat(getModule(), getWhat());
 
        // Valid userid?
-       if ((isMemberIdSet()) && (getMemberId() > 0) && (isMember())) {
+       if (isMember()) {
                // Is valid user
                $userid = getMemberId();
                $isMember = 'Y';
@@ -94,10 +93,10 @@ WHERE
 LIMIT 1",
                array(
                        getModule(),
-                       getAction(),
+                       $action,
                        getWhat(),
-                       $userid,
-                       determineReferalId(),
+                       makeDatabaseUserId($userid),
+                       makeDatabaseUserId(determineReferalId()),
                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),
@@ -108,10 +107,10 @@ 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,
-                               determineReferalId(),
+                               makeDatabaseUserId($userid),
+                               makeDatabaseUserId(determineReferalId()),
                                $isMember,
                                $isAdmin,
                                session_id(),