Removed deprecated 'hidden' column from mod_reg table.

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

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index d31c793c63484772b2885b102f6bbc04bfb799ed..81bcb1f656f7ca06dec84285db39e2e60f7140f5 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,46 +41,41 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Filter for updates/extends on the online list
-function FILTER_UPDATE_ONLINE_LIST ($data) {
+function FILTER_UPDATE_ONLINE_LIST ($filterData) {
        // Do not update online list when extension is deactivated
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if (!isExtensionActive('online', true)) {
+       if (!isExtensionActive('online')) {
                // Extension not active
-               return;
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension ext-online is not active.');
+               return $filterData;
        } // END - if
 
        // Empty session?
-       if (session_id() == '') {
+       if (!isValidSession()) {
                // This is invalid here!
-               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid session.');
+               reportBug(__FUNCTION__, __LINE__, 'Invalid session.');
        } // END - if
 
        // Initialize variables
-       $userid = '0';
-       $isMember = 'N';
-       $isAdmin = 'N';
-       $action = getActionFromModuleWhat(getModule(), getWhat());
+       $userid   = NULL;
+       $isMember = convertBooleanToYesNo(isMember());
+       $isAdmin  = convertBooleanToYesNo(isAdmin());
+       $action   = getActionFromModuleWhat(getModule(), getWhat(FALSE));
 
        // Valid userid?
        if (isMember()) {
-               // Is valid user
+               // Is valid user, so get the userid
                $userid = getMemberId();
-               $isMember = 'Y';
-       } // END - if
-
-       if (isAdmin()) {
-               // Is administrator
-               $isAdmin = 'Y';
        } // END - if
 
        // Now search for the user
-       $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_online` WHERE `sid`='%s' LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_online` WHERE `sid`='%s' LIMIT 1",
                array(session_id()), __FUNCTION__, __LINE__);
 
        // Entry found?
-       if (SQL_NUMROWS($result) == 1) {
+       if (sqlNumRows($result) == 1) {
                // Then update it
-               SQL_QUERY_ESC("UPDATE
+               sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_online`
 SET
        `module`='%s',
@@ -92,15 +87,15 @@ SET
        `is_admin`='%s',
        `timestamp`=UNIX_TIMESTAMP(),
        `ip`='%s'
-WHERE 
+WHERE
        `sid`='%s'
 LIMIT 1",
                array(
                        getModule(),
                        $action,
-                       getWhat(),
-                       makeDatabaseUserId($userid),
-                       makeDatabaseUserId(determineReferalId()),
+                       getWhat(FALSE),
+                       convertZeroToNull($userid),
+                       convertZeroToNull(determineReferralId()),
                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),
@@ -108,13 +103,13 @@ LIMIT 1",
                ), __FUNCTION__, __LINE__);
        } else {
                // No entry does exists so we simply add it!
-               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')",
+               sqlQueryEscaped("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(),
                                $action,
-                               getWhat(),
-                               makeDatabaseUserId($userid),
-                               makeDatabaseUserId(determineReferalId()),
+                               getWhat(FALSE),
+                               convertZeroToNull($userid),
+                               convertZeroToNull(determineReferralId()),
                                $isMember,
                                $isAdmin,
                                session_id(),
@@ -123,14 +118,14 @@ LIMIT 1",
        }
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Purge old entries
-       SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_online` WHERE (UNIX_TIMESTAMP() - `timestamp`) >= {?online_timeout?}', __FUNCTION__, __LINE__);
+       sqlQuery('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_online` WHERE (UNIX_TIMESTAMP() - `timestamp`) >= {?online_timeout?}', __FUNCTION__, __LINE__);
 
        // Return data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // [EOF]