Rewrites to use filters instead of mass if() blocks

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

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index 710e76d92137df2b57a122d9fa5e7873d19212ec..26dd41df983dddcd6fb8d7e7bf487863113ccf2b 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 - 2012 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 *
@@ -44,22 +44,23 @@ if (!defined('__SECURITY')) {
 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 (!isSessionValid()) {
                // This is invalid here!
-               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid session.');
+               reportBug(__FUNCTION__, __LINE__, 'Invalid session.');
        } // END - if
 
        // Initialize variables
        $userid   = NULL;
        $isMember = convertBooleanToYesNo(isMember());
        $isAdmin  = convertBooleanToYesNo(isAdmin());
-       $action   = getActionFromModuleWhat(getModule(), getWhat());
+       $action   = getActionFromModuleWhat(getModule(), getWhat(FALSE));
 
        // Valid userid?
        if (isMember()) {
@@ -92,9 +93,9 @@ LIMIT 1",
                array(
                        getModule(),
                        $action,
-                       getWhat(),
-                       makeZeroToNull($userid),
-                       makeZeroToNull(determineReferalId()),
+                       getWhat(FALSE),
+                       convertZeroToNull($userid),
+                       convertZeroToNull(determineReferralId()),
                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),
@@ -102,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')",
+               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(),
                                $action,
-                               getWhat(),
-                               makeZeroToNull($userid),
-                               makeZeroToNull(determineReferalId()),
+                               getWhat(FALSE),
+                               convertZeroToNull($userid),
+                               convertZeroToNull(determineReferralId()),
                                $isMember,
                                $isAdmin,
                                session_id(),