More globals rewritten, see #100

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 72c61a02c4d26ecb681240151bdc4993a961f7a3..d409525f8ee1a69e759dcbfe46b7ed0b398456e2 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -39,17 +39,15 @@ if (!defined('__SECURITY')) {
 
 // Init "generic filter system"
 function INIT_FILTER_SYSTEM () {
-       global $filters, $loadedFilters, $counter;
-
        // Is the filter already initialized?
-       if ((isset($filters)) && (is_array($filters))) {
+       if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) {
                // Then abort here
                addFatalMessage(getMessage('FILTER_FAILED_ALREADY_INIT'));
                return false;
        } // END - if
 
        // Init the filter system (just some ideas)
-       $filters = array(
+       $GLOBALS['filters']['chains'] = array(
                // Filters for pre-init phase
                'preinit'   => array(),
                // Filters for post-init phase
@@ -59,8 +57,8 @@ function INIT_FILTER_SYSTEM () {
        );
 
        // Init loaded filters and counter
-       $loadedFilters =  array();
-       $counter = array();
+       $GLOBALS['filters']['loaded'] =  array();
+       $GLOBALS['filters']['counter'] = array();
 
        // Load all saved filers if sql_patches is updated
        if (GET_EXT_VERSION("sql_patches") >= "0.5.9") {
@@ -82,18 +80,18 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
                                $filterFunction = $filterArray['filter_function'];
 
                                // Set counter to default
-                               $counter[$filterName][$filterFunction] = 0;
+                               $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0;
 
                                // Mark this filter as loaded (from database)
-                               $loadedFilters[$filterName][$filterFunction] = true;
+                               $GLOBALS['filters']['loaded'][$filterName][$filterFunction] = true;
 
                                // Set this filter
-                               $filters[$filterName][$filterFunction] = $filterArray['filter_active'];
+                               $GLOBALS['filters']['chains'][$filterName][$filterFunction] = $filterArray['filter_active'];
 
                                // Is the array element for counter there?
                                if (isset($filterArray['filter_counter'])) {
                                        // Then use this value!
-                                       $counter[$filterName][$filterFunction] = $filterArray['filter_counter'];
+                                       $GLOBALS['filters']['counter'][$filterName][$filterFunction] = $filterArray['filter_counter'];
                                } // END - if
                        } // END - while
                } // END - if
@@ -135,13 +133,11 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
 
 // "Registers" a new filter function
 function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) {
-       global $filters, $counter;
-
        // Extend the filter function name
        $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
 
        // Is that filter already there?
-       if ((isset($filters[$filterName][$filterFunction])) && (!$force)) {
+       if ((isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
                // Then abort here
                if (!$silentAbort) {
                        addFatalMessage(getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
@@ -161,22 +157,20 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        // Shall we add it?
        if (!$dry_run) {
                // Simply add it to the array
-               $filters[$filterName][$filterFunction] = "Y";
-               $counter[$filterName][$filterFunction] = 0;
+               $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "Y";
+               $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0;
        } // END - if
 }
 
 // "Unregisters" a filter from the given chain
 function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_run = false) {
-       global $filters, $counter, $loadedFilters;
-
        // Extend the filter function name only if not loaded from database
-       if (!isset($loadedFilters[$filterName][$filterFunction])) {
+       if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) {
                $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
        } // END - if
 
        // Is that filter there?
-       if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) {
+       if ((!isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
                // Not found, so abort here
                addFatalMessage(getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName));
                return false;
@@ -185,17 +179,15 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
        // Shall we remove? (default, not while just showing an extension removal)
        if (!$dry_run) {
                // Mark for filter removal
-               $filters[$filterName][$filterFunction] = "R";
-               unset($counter[$filterName][$filterFunction]);
+               $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "R";
+               unset($GLOBALS['filters']['counter'][$filterName][$filterFunction]);
        } // END  - if
 }
 
 // "Runs" the given filters, data is optional and can be any type of data
 function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
-       global $filters, $counter;
-
        // Is that filter chain there?
-       if (!isset($filters[$filterName])) {
+       if (!isset($GLOBALS['filters']['chains'][$filterName])) {
                // Then abort here (quick'N'dirty hack)
                if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
                        // Add fatal message
@@ -210,7 +202,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
        $returnValue = $data;
 
        // Then run all filters
-       foreach ($filters[$filterName] as $filterFunction=>$active) {
+       foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction=>$active) {
                // Debug message
                //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): name={$filterName},func={$filterFunction},active={$active}<br />\n";
 
@@ -229,7 +221,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
                        $returnValue = call_user_func_array($filterFunction, array($returnValue));
 
                        // Update usage counter
-                       $counter[$filterName][$filterFunction]++;
+                       $GLOBALS['filters']['counter'][$filterName][$filterFunction]++;
                } // END - if
        } // END - foreach
 
@@ -243,7 +235,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
 
 // Filter for flushing all new filters to the database
 function FILTER_FLUSH_FILTERS () {
-       global $filters, $counter, $loadedFilters, $SQLs;
+       global $SQLs;
 
        // Clear all previous SQL queries
        $SQLs = array();
@@ -269,11 +261,11 @@ function FILTER_FLUSH_FILTERS () {
        $removeSQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_filters` WHERE";
 
        // Write all filters to database
-       foreach ($filters as $filterName => $filterArray) {
+       foreach ($GLOBALS['filters']['chains'] as $filterName => $filterArray) {
                // Walk through all filters
                foreach ($filterArray as $filterFunction => $active) {
                        // Is this filter loaded?
-                       if (!isset($loadedFilters[$filterName][$filterFunction])) {
+                       if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) {
                                // Add this filter (all filters are active by default)
                                $insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
                                $inserted++;
@@ -306,7 +298,7 @@ function FILTER_FLUSH_FILTERS () {
        // Shall we update usage counters (ONLY FOR DEBUGGING!)
        if (getConfig('update_filter_usage') == "Y") {
                // Update all counters
-               foreach ($counter as $filterName => $filterArray) {
+               foreach ($GLOBALS['filters']['counter'] as $filterName => $filterArray) {
                        // Walk through all filters
                        foreach ($filterArray as $filterFunction => $cnt) {
                                // Construct and add the query
@@ -356,6 +348,7 @@ 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?
@@ -440,8 +433,7 @@ function FILTER_RUN_SQLS ($data) {
 
 // Filter for updating/validating login data
 function FILTER_UPDATE_LOGIN_DATA () {
-       global $LAST;
-       if (!is_array($LAST)) $LAST = array();
+       if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
 
        // Recheck if logged in
        if (!IS_MEMBER()) return false;
@@ -462,8 +454,8 @@ function FILTER_UPDATE_LOGIN_DATA () {
                if (empty($mod)) $mod = "login";
 
                // This will be displayed on welcome page! :-)
-               if (empty($LAST['module'])) {
-                       $LAST['module'] = $mod; $LAST['online'] = $onl;
+               if (empty($GLOBALS['last']['module'])) {
+                       $GLOBALS['last']['module'] = $mod; $GLOBALS['last']['online'] = $onl;
                } // END - if
 
                // "what" not set?