X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=82747fef797677782a26230abab3c6528210e5a2;hp=b797f90f15130559594b1710859f0950c6384d43;hb=9b8d0c1de007c1149af813c07773c3536c71ddd5;hpb=6a545ced209c14b75d2dc04f43ee010e9ae9b47c diff --git a/inc/filter-functions.php b/inc/filter-functions.php index b797f90f15..82747fef79 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -50,30 +51,12 @@ function initFilterSystem () { } // END - if // Load all saved filers if sql_patches is updated - if (isset($GLOBALS['cache_array']['filter']['filter_name'])) { - // Init dummy array - $filterArray = array( - 'chains' => array(), - 'loaded' => array(), - 'counter' => array() - ); - - // Found in cache so rewrite the 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 + if ((isset($GLOBALS['cache_array']['filter']['filter_name'])) && (!isset($GLOBALS['cache_array']['filter']['chains']))) { + // Prepare filter array + prepareFilterArray(); // Mark it as initialized $GLOBALS['filter_init'] = true; - - // Remove the cache - $GLOBALS['cache_array']['filter'] = $filterArray; } elseif ((!isInstallationPhase()) && (isExtensionInstalledAndNewer('sql_patches', '0.5.9'))) { // Init add $add = ''; @@ -118,9 +101,9 @@ ORDER BY // Init filters registerFilter('init', 'LOAD_CONFIGURATION'); - registerFilter('init', 'INIT_EXTENSIONS'); registerFilter('init', 'INIT_RANDOMIZER'); registerFilter('init', 'LOAD_RUNTIME_INCLUDES'); + registerFilter('init', 'INIT_EXTENSIONS'); registerFilter('init', 'INIT_RANDOM_NUMBER'); registerFilter('init', 'CHECK_SVN_REVISION'); registerFilter('init', 'RUN_DAILY_RESET'); @@ -131,6 +114,14 @@ ORDER BY registerFilter('init', 'UPDATE_LOGIN_DATA'); registerFilter('init', 'ACTIVATE_EXCHANGE'); + // Page headers - pre-filter (normally, you want to register here) + registerFilter('pre_page_header', 'LOAD_PAGE_HEADER'); + + // Page headers - post-filter (normally, you don't want to register here) + // ------------------- LAST FILTER FOR THIS CHAIN! ------------------------ + registerFilter('post_page_header', 'FINISH_PAGE_HEADER'); + // ------------------- LAST FILTER FOR THIS CHAIN! ------------------------ + // Login failures handler registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); @@ -187,10 +178,15 @@ ORDER BY // Member login check. Always keep FETCH_USER_DATA as first entry! registerFilter('member_login_check', 'FETCH_USER_DATA'); + + // Admin login + registerFilter('do_admin_login_done', 'DO_LOGIN_ADMIN'); } // "Registers" a new filter function function registerFilter ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction); + // Extend the filter function name $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction)); @@ -216,7 +212,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for } // END - if // Simply add it to the array - //* DEBUG: */ print __FUNCTION__.': filterName='.$filterName.',filterFunction='.$filterFunction.'
'; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REGISTER: filterName=' . $filterName . ',filterFunction=' . $filterFunction); $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'A'; $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0'; } // END - if @@ -224,6 +220,8 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for // "Unregisters" a filter from the given chain function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_run = false) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run)); + // Extend the filter function name only if not loaded from database if (!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) { $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction)); @@ -239,7 +237,7 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru // Shall we remove? (default, not while just showing an extension removal) if ($dry_run === false) { // Mark for filter removal - //* DEBUG: */ print __FUNCTION__.': filterName='.$filterName.',filterFunction='.$filterFunction.'
'; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: filterName=' . $filterName . ',filterFunction=' . $filterFunction); $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R'; } // END - if } @@ -247,12 +245,12 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru // "Runs" the given filters, data is optional and can be any type of data function runFilterChain ($filterName, $data = null) { // Is that filter chain there? - if ((!isset($GLOBALS['cache_array']['filter']['chains'][$filterName])) && (isDebugModeEnabled())) { - // 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!'); + if (!isset($GLOBALS['cache_array']['filter']['chains'][$filterName])) { + // Log not found filters in debug-mode + if (isDebugModeEnabled()) { + // Log it away... + logDebugMessage(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!'); + } // END - if // Abort here and return content return $data; @@ -278,7 +276,7 @@ function runFilterChain ($filterName, $data = null) { } // END - if // Call the filter chain - //* DEBUG: */ print $filterName.'/'.$filterFunction.',[]='.gettype($returnValue).'
'; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName.'/'.$filterFunction.',[]='.gettype($returnValue)); $returnValue = call_user_func_array($filterFunction, array($returnValue)); // Update usage counter @@ -305,5 +303,35 @@ function countFilterUsage ($filterName, $filterFunction) { } } +// Prepares the filter array for usage +function prepareFilterArray () { + // Abort here if array is absend (e.g. not cached) + if (!isset($GLOBALS['cache_array']['filter']['filter_name'])) { + // Abort silently + return false; + } // END - if + + // Init dummy array + $filterArray = array( + 'chains' => array(), + 'loaded' => array(), + 'counter' => array() + ); + + // Found in cache so rewrite the 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 + + // Remove the cache + $GLOBALS['cache_array']['filter'] = $filterArray; +} + // [EOF] ?>