X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=5f9fa665c497d402768a257adfa84ae2a8fc1b83;hb=30c4ffdadae5e5a2a39528fa9d8de4803055f123;hp=e5714e88b7017e4e2997ed51b7034428a821b842;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git diff --git a/inc/filters.php b/inc/filters.php index e5714e88b7..5f9fa665c4 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -43,22 +43,18 @@ if (!defined('__SECURITY')) { } // Init "generic filter system" -function INIT_FILTER_SYSTEM () { +function initFilterSystem () { // Is the filter already initialized? if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) { // Then abort here - addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_INIT')); - return false; + debug_report_bug(getMessage('FILTER_FAILED_ALREADY_INIT')); } // END - if // Init the filter system (just some ideas) $GLOBALS['filters']['chains'] = array( - // Filters for pre-init phase - 'preinit' => array(), - // Filters for post-init phase - 'postinit' => array(), - // Filters for shutdown phase - 'shutdown' => array() + 'preinit' => array(), // Filters for pre-init phase + 'postinit' => array(), // Filters for post-init phase + 'shutdown' => array() // Filters for shutdown phase ); // Init loaded filters and counter @@ -66,7 +62,26 @@ function INIT_FILTER_SYSTEM () { $GLOBALS['filters']['counter'] = array(); // Load all saved filers if sql_patches is updated - if (GET_EXT_VERSION('sql_patches') >= '0.5.9') { + if (isset($GLOBALS['cache_array']['filter']['filter_name'])) { + // Found in cache so rewrite the array + $filterArray = array(); + foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) { + // Get filter function + $filterFunction = $GLOBALS['cache_array']['filter']['filter_function'][$idx]; + + // Add the element with mapped index + $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx]; + $filterArray['loaded'][$filterName][$filterFunction] = true; + $filterArray['chains'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_active'][$idx]; + } // END - foreach + + // Set the array + //die('
'.print_r($filterArray, true).''); + $GLOBALS['filters'] = $filterArray; + + // Remove the cache + unset($GLOBALS['cache_array']['filter']); + } elseif (GET_EXT_VERSION('sql_patches') >= '0.5.9') { // Init add $add = ''; if (GET_EXT_VERSION('sql_patches') >= '0.6.0') $add = ", `filter_counter`"; @@ -103,49 +118,49 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__); // Free result SQL_FREERESULT($result); - } // END - if + } // Init filters - REGISTER_FILTER('init', 'UPDATE_LOGIN_DATA'); - REGISTER_FILTER('init', 'INIT_RANDOMIZER'); + registerFilter('init', 'UPDATE_LOGIN_DATA'); + registerFilter('init', 'INIT_RANDOMIZER'); // Login failures handler - REGISTER_FILTER('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); + registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); // Filters for pre-extension-registration - REGISTER_FILTER('pre_extension_installed', 'RUN_SQLS'); + registerFilter('pre_extension_installed', 'RUN_SQLS'); // Filters for post-extension-registration - REGISTER_FILTER('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION'); - REGISTER_FILTER('post_extension_installed', 'SOLVE_TASK'); - REGISTER_FILTER('post_extension_installed', 'loadIncludeLUDES'); - REGISTER_FILTER('post_extension_installed', 'REMOVE_UPDATES'); + registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION'); + registerFilter('post_extension_installed', 'SOLVE_TASK'); + registerFilter('post_extension_installed', 'LOAD_INCLUDES'); + registerFilter('post_extension_installed', 'REMOVE_UPDATES'); // Solving tasks - REGISTER_FILTER('solve_task', 'SOLVE_TASK'); + registerFilter('solve_task', 'SOLVE_TASK'); // Loading includes in general - REGISTER_FILTER('load_includes', 'loadIncludeLUDES'); + registerFilter('load_includes', 'LOAD_INCLUDES'); // Run SQLs - REGISTER_FILTER('run_sqls', 'RUN_SQLS'); + registerFilter('run_sqls', 'RUN_SQLS'); // Admin ACL check - REGISTER_FILTER('check_admin_acl', 'CHECK_ADMIN_ACL'); + registerFilter('check_admin_acl', 'CHECK_ADMIN_ACL'); // Register shutdown filters - REGISTER_FILTER('shutdown', 'FLUSH_FILTERS'); + registerFilter('shutdown', 'FLUSH_FILTERS'); } // "Registers" a new filter function -function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) { +function registerFilter ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) { // Extend the filter function name $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction)); // Is that filter already there? if ((isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) { // Then abort here - if (!$silentAbort) { + if ($silentAbort === false) { addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName)); } // END - if @@ -169,7 +184,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo } // "Unregisters" a filter from the given chain -function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_run = false) { +function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_run = false) { // Extend the filter function name only if not loaded from database if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) { $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction)); @@ -183,22 +198,18 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r } // END - if // Shall we remove? (default, not while just showing an extension removal) - if (!$dry_run) { + if ($dry_run === false) { // Mark for filter removal - $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "R"; - unset($GLOBALS['filters']['counter'][$filterName][$filterFunction]); + $GLOBALS['filters']['chains'][$filterName][$filterFunction] = 'R'; } // END - if } // "Runs" the given filters, data is optional and can be any type of data -function runFilterChain ($filterName, $data = null, $silentAbort = true) { +function runFilterChain ($filterName, $data = null) { // 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(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName); - } // END - if + // We should find all these non-existing filter chains + DEBUG_LOG(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!'); // Abort here return false; @@ -208,16 +219,16 @@ function runFilterChain ($filterName, $data = null, $silentAbort = true) { $returnValue = $data; // Then run all filters - foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction=>$active) { + foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction => $active) { // Debug message - //* DEBUG: */ echo __FUNCTION__."(".__LINE__."): name={$filterName},func={$filterFunction},active={$active}