More constant rewrites

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 750d278b9fdf83a39b14cb822a6a41872210c0f8..f48e19967b735678f8e08346cbe1dd5f8d1a810d 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -42,7 +42,7 @@ function INIT_FILTER_SYSTEM () {
        // Is the filter already initialized?
        if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) {
                // Then abort here
-               addFatalMessage(getMessage('FILTER_FAILED_ALREADY_INIT'));
+               addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_INIT'));
                return false;
        } // END - if
 
@@ -140,7 +140,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        if ((isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
                // Then abort here
                if (!$silentAbort) {
-                       addFatalMessage(getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
+                       addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
                } // END - if
 
                // Abort here
@@ -150,7 +150,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        // Is the function there?
        if (!function_exists($filterFunction)) {
                // Then abort here
-               addFatalMessage(getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName));
+               addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName));
                return false;
        } // END - if
 
@@ -172,7 +172,7 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
        // Is that filter there?
        if ((!isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
                // Not found, so abort here
-               addFatalMessage(getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName));
+               addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName));
                return false;
        } // END - if
 
@@ -185,13 +185,13 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
 }
 
 // "Runs" the given filters, data is optional and can be any type of data
-function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
+function runFilterChain ($filterName, $data = null, $silentAbort = true) {
        // Is that filter chain there?
        if (!isset($GLOBALS['filters']['chains'][$filterName])) {
                // Then abort here (quick'N'dirty hack)
                if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
                        // Add fatal message
-                       addFatalMessage(getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
+                       addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
                } // END - if
 
                // Abort here
@@ -235,15 +235,13 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
 
 // Filter for flushing all new filters to the database
 function FILTER_FLUSH_FILTERS () {
-       global $SQLs;
-
        // Clear all previous SQL queries
-       $SQLs = array();
+       INIT_SQLS();
 
        // Is a database link here and not in installation mode?
-       if ((!SQL_IS_LINK_UP()) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
+       if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
                // Abort here
-               addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), array($filterFunction, $filterName));
+               addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
                return false;
        } // END - if
 
@@ -283,7 +281,7 @@ function FILTER_FLUSH_FILTERS () {
                $insertSQL = substr($insertSQL, 0, -1);
 
                // And run it
-               $SQLs[] = $insertSQL;
+               ADD_SQL($insertSQL);
        } // END - if
 
        // Something has been removed?
@@ -292,7 +290,7 @@ function FILTER_FLUSH_FILTERS () {
                $removeSQL = substr($removeSQL, 0, -2) . "LIMIT ".$removed;
 
                // And run it
-               $SQLs[] = $removeSQL;
+               ADD_SQL($removeSQL);
        } // END - if
 
        // Shall we update usage counters (ONLY FOR DEBUGGING!)
@@ -302,17 +300,17 @@ function FILTER_FLUSH_FILTERS () {
                        // Walk through all filters
                        foreach ($filterArray as $filterFunction => $cnt) {
                                // Construct and add the query
-                               $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
+                               ADD_SQL(sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
                                        bigintval($cnt),
                                        $filterName,
                                        $filterFunction
-                               );
+                               ));
                        } // END - foreach
                } // END - foreach
        } // END - if
 
        // Run the run_sqls filter in non-dry mode
-       RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
+       runFilterChain('run_sqls');
 }
 
 // Filter for calling the handler for login failures
@@ -348,11 +346,8 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
 
 // Filter for auto-activation of a extension
 function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
-       // @TODO Try to rewrite this
-       global $EXT_ALWAYS_ACTIVE;
-
        // Is this extension always activated?
-       if ($EXT_ALWAYS_ACTIVE == "Y") {
+       if (EXT_GET_ALWAYS_ACTIVE() == "Y") {
                // Then activate the extension
                //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ext_name={$data['ext_name']}<br />\n";
                ACTIVATE_EXTENSION($data['ext_name']);
@@ -388,7 +383,7 @@ function FILTER_LOAD_INCLUDES ($data) {
        // Is it an array?
        if ((!isset($data)) || (!is_array($data))) {
                // Then abort here
-               debug_report_bug(sprintf("INC_POOL is no array! Type: %s", $INC_POOL));
+               debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($INC_POOL)));
        } elseif (isset($data['inc_pool'])) {
                // Use this as new inclusion pool!
                $INC_POOL = $data['inc_pool'];
@@ -412,9 +407,9 @@ function FILTER_LOAD_INCLUDES ($data) {
 // Filter for running SQL commands
 function FILTER_RUN_SQLS ($data) {
        // Is the array there?
-       if ((isset($data['sqls'])) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
+       if ((IS_SQLS_VALID()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
                // Run SQL commands
-               foreach ($data['sqls'] as $sql) {
+               foreach (GET_SQLS() as $sql) {
                        $sql = trim($sql);
                        if (!empty($sql)) {
                                // Do we have an "ALTER TABLE" command?