Added update_year.sh (still not fully flexible) and updated all years with it.

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

diff --git a/inc/filter/blacklist_filter.php b/inc/filter/blacklist_filter.php
index 82cce253ecd5b013a08ad5555d1190a0af39bc0d..4ef45336e5b4b4997799213ea18dfbefbf880f31 100644 (file)
--- a/inc/filter/blacklist_filter.php
+++ b/inc/filter/blacklist_filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -81,7 +81,7 @@ function FILTER_CHECK_URL_BLACKLISTED ($filterData) {
        if ((isUrlBlacklistEnabled()) && (isUrlBlacklisted($filterData['url']))) {
                // Create redirect-URL
                $filterData['redirect'] = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $GLOBALS['blacklist_data'][$filterData['url']]['timestamp'];
-               $GLOBALS['filter_chain_aborted'] = TRUE;
+               interruptFilterChain();
 
                // Set data for next filter chain
                $filterData['init_done']   = FALSE;
@@ -100,7 +100,7 @@ function FILTER_CHECK_URL_BLACKLISTED ($filterData) {
 // Filter for logging blacklisted email addresses, is being called from above filter
 function FILTER_LOG_EMAIL_BLACKLISTED ($filerData) {
        // Make sure, that required data is there
-       assert((isset($filterData['init_done'])) && ($filterData['blacklisted'] == 'email'), 'filterData[init] must be set, filterData[blacklisted]=' . $filterData['blacklisted']);
+       assert((isset($filterData['init_done'])) && ($filterData['blacklisted'] == 'email'));
 
        // @TODO Insert log entry
 
@@ -111,7 +111,7 @@ function FILTER_LOG_EMAIL_BLACKLISTED ($filerData) {
 // Filter for logging blacklisted IP addresses, is being called from above filter
 function FILTER_LOG_IP_BLACKLISTED ($filerData) {
        // Make sure, that required data is there
-       assert((isset($filterData['init_done'])) && ($filterData['blacklisted'] == 'ip'), 'filterData[init] must be set, filterData[blacklisted]=' . $filterData['blacklisted']);
+       assert((isset($filterData['init_done'])) && ($filterData['blacklisted'] == 'ip'));
 
        // @TODO Insert log entry
 
@@ -122,7 +122,7 @@ function FILTER_LOG_IP_BLACKLISTED ($filerData) {
 // Filter for logging blacklisted URLs, is being called from above filter
 function FILTER_LOG_URL_BLACKLISTED ($filerData) {
        // Make sure, that required data is there
-       assert((isset($filterData['init_done'])) && ($filterData['blacklisted'] == 'url'), 'filterData[init] must be set, filterData[blacklisted]=' . $filterData['blacklisted']);
+       assert((isset($filterData['init_done'])) && ($filterData['blacklisted'] == 'url'));
 
        // @TODO Insert log entry