Introduced interruptFilterChain() and continueFilterChain(). Please DO ALWAYS use...

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

diff --git a/inc/filter/order_filter.php b/inc/filter/order_filter.php
index a961dde09be96a372f4fbe85fccb28e836d7a3ff..7b32e11122084ee152c2d6cd644df603b332bc8c 100644 (file)
--- a/inc/filter/order_filter.php
+++ b/inc/filter/order_filter.php
@@ -136,7 +136,7 @@ function FILTER_MAIL_ORDER_GENERIC_CHECK_SUBJECT ($filterData) {
                if ((isInStringIgnoreCase('https://', $filterData['subject'])) || (isInStringIgnoreCase('http://', $filterData['subject'])) || (isInStringIgnoreCase('www', $filterData['subject']))) {
                        // URL in subject found
                        $filterData['redirect'] = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL');
-                       $GLOBALS['filter_chain_aborted'] = TRUE;
+                       interruptFilterChain();
                } // END - if
        } // END - if
 
@@ -154,7 +154,7 @@ function FILTER_MAIL_ORDER_GENERIC_CHECK_TEXT ($filterData) {
                if ((isInStringIgnoreCase('https://', $filterData['text'])) || (isInStringIgnoreCase('http://', $filterData['text'])) || (isInStringIgnoreCase('www', $filterData['text']))) {
                        // URL found
                        $filterData['redirect'] = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
-                       $GLOBALS['filter_chain_aborted'] = TRUE;
+                       interruptFilterChain();
                } // END - if
 
                // Remove new-line and carriage-return characters
@@ -164,7 +164,7 @@ function FILTER_MAIL_ORDER_GENERIC_CHECK_TEXT ($filterData) {
                if (strlen($TEST) > getMaxTextLength()) {
                        // Text is too long!
                        $filterData['redirect'] = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
-                       $GLOBALS['filter_chain_aborted'] = TRUE;
+                       interruptFilterChain();
                } // END - if
        } // END - if
 
@@ -181,7 +181,7 @@ function FILTER_MAIL_ORDER_GENERIC_CHECK_TYPE ($filterData) {
        if ((!isset($filterData['mail_type'])) || ($filterData['mail_type'] < 1)) {
                // Not correctly set
                $filterData['redirect'] = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_MAIL_TYPE');
-               $GLOBALS['filter_chain_aborted'] = TRUE;
+               interruptFilterChain();
        } // END - if
 
        // Return the data for next filter
@@ -197,7 +197,7 @@ function FILTER_MAIL_ORDER_GENERIC_CHECK_URL ($filterData) {
        if (!isUrlValid($filterData['url'])) {
                // URL is invalid!
                $filterData['redirect'] = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_URL');
-               $GLOBALS['filter_chain_aborted'] = TRUE;
+               interruptFilterChain();
        } // END - if
 
        // Return the data for next filter
@@ -213,7 +213,7 @@ function FILTER_MAIL_ORDER_GENERIC_CHECK_RECEIVER ($filterData) {
        if (($filterData['receiver'] < getOrderMin()) && (!isAdmin())) {
                // Less than allowed receivers entered!
                $filterData['redirect'] = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS3');
-               $GLOBALS['filter_chain_aborted'] = TRUE;
+               interruptFilterChain();
        } // END - if
 
        // Return the data for next filter