A lot calls saved, expression language rewritten:

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

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 125f4a38a70821e9069b015fd2b56eab616eb120..14c8503b624deafad86e08036c9207a9415197c0 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/18/2008 *
- * ================                             Last change: 12/18/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 12/18/2008 *
+ * ===================                          Last change: 12/18/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : online_functions.php                             *
@@ -18,6 +18,7 @@
  * 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 +40,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 +50,26 @@ 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';
+       $userid = '0';
+       $isMember = 'N';
+       $isAdmin = 'N';
 
        // Valid userid?
        if ((isMemberIdSet()) && (getMemberId() > 0) && (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 +84,7 @@ SET
        `action`='%s',
        `what`='%s',
        `userid`=%s,
-       `refid`='%s',
+       `refid`=%s,
        `is_member`='%s',
        `is_admin`='%s',
        `timestamp`=UNIX_TIMESTAMP(),
@@ -99,9 +97,9 @@ LIMIT 1",
                        getAction(),
                        getWhat(),
                        $userid,
-                       $rid,
-                       $MEM,
-                       $ADMIN,
+                       makeDatabaseUserId(determineReferalId()),
+                       $isMember,
+                       $isAdmin,
                        detectRemoteAddr(),
                        session_id()
                ), __FUNCTION__, __LINE__);
@@ -113,9 +111,9 @@ LIMIT 1",
                                getAction(),
                                getWhat(),
                                $userid,
-                               $rid,
-                               $MEM,
-                               $ADMIN,
+                               makeDatabaseUserId(determineReferalId()),
+                               $isMember,
+                               $isAdmin,
                                session_id(),
                                detectRemoteAddr()
                        ), __FUNCTION__, __LINE__);