mailer project continued:

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

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index c1459c6b096804060926607c55a2bbdb131c6681..c124eec65edad33a10c8d21d98d09e7e1a6400e8 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -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() == '') {
                // 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(determineReferralId()),
+                       getWhat(false),
+                       convertZeroToNull($userid),
+                       convertZeroToNull(determineReferralId()),
                        $isMember,
                        $isAdmin,
                        detectRemoteAddr(),
@@ -106,9 +107,9 @@ LIMIT 1",
                        array(
                                getModule(),
                                $action,
-                               getWhat(),
-                               makeZeroToNull($userid),
-                               makeZeroToNull(determineReferralId()),
+                               getWhat(false),
+                               convertZeroToNull($userid),
+                               convertZeroToNull(determineReferralId()),
                                $isMember,
                                $isAdmin,
                                session_id(),