X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=819c891e706f685da9238c7430fb7a0133aaa68d;hb=10492182b811dfcc6279bc43f99c49f847e326a4;hp=274ded1875e60b1975ac21e9ee741694ffdaf913;hpb=21f5c300431f4d667b2d197a69714c63ba37b950;p=mailer.git
diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 274ded1875..819c891e70 100644
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -44,9 +44,9 @@ if (!defined('__SECURITY')) {
// Init "generic filter system"
function initFilterSystem () {
// Is the filter already initialized?
- if (isset($GLOBALS['filters'])) {
+ if (isset($GLOBALS['filter_init'])) {
// Then abort here
- debug_report_bug(getMessage('FILTER_FAILED_ALREADY_INIT'));
+ debug_report_bug('Filter system already initialized.');
} // END - if
// Load all saved filers if sql_patches is updated
@@ -69,8 +69,8 @@ function initFilterSystem () {
$filterArray['chains'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_active'][$idx];
} // END - foreach
- // Mark filters as loaded
- $GLOBALS['cache_array']['filter'] = true;
+ // Mark it as initialized
+ $GLOBALS['filter_init'] = true;
// Remove the cache
$GLOBALS['cache_array']['filter'] = $filterArray;
@@ -119,13 +119,15 @@ ORDER BY
// Init filters
registerFilter('init', 'LOAD_CONFIGURATION');
registerFilter('init', 'INIT_EXTENSIONS');
+ registerFilter('init', 'INIT_RANDOMIZER');
registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
+ registerFilter('init', 'INIT_RANDOM_NUMBER');
registerFilter('init', 'CHECK_SVN_REVISION');
registerFilter('init', 'RUN_DAILY_RESET');
- registerFilter('init', 'INIT_RANDOMIZER');
registerFilter('init', 'TRIGGER_SENDING_POOL');
registerFilter('init', 'DETERMINE_USERNAME');
registerFilter('init', 'DETERMINE_WHAT_ACTION');
+ registerFilter('init', 'COUNT_MODULE');
registerFilter('init', 'UPDATE_LOGIN_DATA');
registerFilter('init', 'ACTIVATE_EXCHANGE');
@@ -173,6 +175,14 @@ ORDER BY
// Exclude some users
registerFilter('exclude_users', 'HTML_INCLUDE_USERS');
+
+ // Handling of fatal errors
+ registerFilter('handle_fatal_errors', 'HANDLE_FATAL_ERRORS');
+
+ // Page footer filters
+ registerFilter('page_footer', 'HANDLE_FATAL_ERRORS');
+ registerFilter('page_footer', 'DISPLAY_COPYRIGHT');
+ registerFilter('page_footer', 'DISPLAY_PARSING_TIME');
}
// "Registers" a new filter function
@@ -184,7 +194,8 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
if ((isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === false)) {
// Then abort here
if ($silentAbort === false) {
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
+ // Add fatal message
+ addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter chain %s has already filter function %s registered!", $filterName, $filterFunction));
} // END - if
// Abort here
@@ -196,7 +207,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
// Is the function there?
if (!function_exists($filterFunction)) {
// Then abort here
- addFatalMessage(__FUNCTION__, __LINE__, sprintf(getMessage('FILTER_FAILED_404'), $filterFunction, $filterName));
+ addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter function %s could not be added to filter chain %s.", $filterFunction, $filterName));
return false;
} // END - if
@@ -234,10 +245,10 @@ function runFilterChain ($filterName, $data = null) {
// Is that filter chain there?
if (!isset($GLOBALS['cache_array']['filter']['chains'][$filterName])) {
// We should find all these non-existing filter chains
- /* Only for tracking: */ if ($filterName != 'sql_admin_extra_data') {
- /* Only for tracking: */ debug_report_bug('Filter chain ' . $filterName . ' not found!');
- /* Only for tracking: */ }
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!');
+ //* Only for tracking: */ if ($filterName != 'sql_admin_extra_data') {
+ //* Only for tracking: */ debug_report_bug('Filter chain ' . $filterName . ' not found!');
+ //* Only for tracking: */ }
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!');
// Abort here and return content
return $data;