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 9bf00786400cc069000bb391454a0a491ee623cd..a989e1f2a29be41dd08731557fc402900e5a277d 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 12/18/2008 *
- * ================                             Last change: 12/18/2008 *
+ * ===================                          Last change: 12/18/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : online_functions.php                             *
@@ -14,10 +14,9 @@
  * $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                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Filter for updates/extends on the online list
 function FILTER_UPDATE_ONLINE_LIST () {
@@ -49,29 +48,27 @@ function FILTER_UPDATE_ONLINE_LIST () {
        // Empty session?
        if (session_id() == '') {
                // This is invalid here!
-               debug_report_bug('Invalid session.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid session.');
        } // END - if
 
        // 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__);
@@ -86,7 +83,7 @@ SET
        `action`='%s',
        `what`='%s',
        `userid`=%s,
-       `refid`='%s',
+       `refid`=%s,
        `is_member`='%s',
        `is_admin`='%s',
        `timestamp`=UNIX_TIMESTAMP(),
@@ -96,12 +93,12 @@ WHERE
 LIMIT 1",
                array(
                        getModule(),
-                       getAction(),
+                       $action,
                        getWhat(),
-                       $userid,
-                       $rid,
-                       $MEM,
-                       $ADMIN,
+                       makeDatabaseUserId($userid),
+                       makeDatabaseUserId(determineReferalId()),
+                       $isMember,
+                       $isAdmin,
                        detectRemoteAddr(),
                        session_id()
                ), __FUNCTION__, __LINE__);
@@ -110,12 +107,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($userid),
+                               makeDatabaseUserId(determineReferalId()),
+                               $isMember,
+                               $isAdmin,
                                session_id(),
                                detectRemoteAddr()
                        ), __FUNCTION__, __LINE__);