X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=1960dadff976e7530b416c28184d68e86169fc8b;hp=0ec69f0fb318f4701ebf997779aaae6aa08a2245;hb=5cf56305e05df061e2d3ef50f3019a8414aa6ca8;hpb=f4d7dc336fde4cebc47701026a94d193f77854a1 diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 0ec69f0fb3..1960dadff9 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -17,7 +17,7 @@ * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -120,12 +120,13 @@ ORDER BY registerFilter('pre_page_header', 'LOAD_PAGE_HEADER'); // Page headers - post-filter (normally, you don't want to register here) - // ------------------- LAST FILTER FOR THIS CHAIN! ------------------------ + //-------------------- LAST FILTER FOR THIS CHAIN! ------------------------ registerFilter('post_page_header', 'FINISH_PAGE_HEADER'); - // ------------------- LAST FILTER FOR THIS CHAIN! ------------------------ + //-------------------- LAST FILTER FOR THIS CHAIN! ------------------------ // 'You are here' navigation - post filter registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); + registerFilter('post_youhere_line', 'HANDLE_HOME_IN_INDEX_SETTING'); // Filters for pre-extension-registration registerFilter('pre_extension_installed', 'RUN_SQLS'); @@ -187,6 +188,9 @@ ORDER BY // Admin login registerFilter('do_admin_login_done', 'DO_LOGIN_ADMIN'); + + // Admin mail links + registerFilter('generate_admin_mail_links', 'GENERATE_POOL_MAIL_LINKS'); } // "Registers" a new filter function @@ -221,7 +225,10 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for //* 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 + } elseif (($silentAbort === false) && (!function_exists($filterFunction))) { + // Please report them all! + debug_report_bug(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',silentAbort=false,force=' . intval($force) . ',dry_run=' . intval($dry_run) . ' - NOT FOUND!'); + } //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - EXIT!'); } @@ -253,7 +260,7 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false, } // "Runs" the given filters, filterData is optional and can be any type of data -function runFilterChain ($filterName, $filterData = null) { +function runFilterChain ($filterName, $filterData = NULL) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterData[]=' . gettype($filterData) . ' - ENTERED!'); // Is that filter chain there? @@ -269,6 +276,7 @@ function runFilterChain ($filterName, $filterData = null) { } // END - if // Default return value + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',count()=' . count($GLOBALS['cache_array']['filter']['chains'][$filterName])); $returnValue = $filterData; // Then run all filters @@ -280,11 +288,8 @@ function runFilterChain ($filterName, $filterData = null) { if (($active == 'Y') || ($active == 'A') || ((in_array($filterName, array('shutdown','extension_remove','post_extension_run_sql'))) && ($active == 'R'))) { // Is this filter there? if (!function_exists($filterFunction)) { - // Unregister it - unregisterFilter(__FUNCTION__, __LINE__, $filterName, $filterFunction); - - // Skip this entry - continue; + // Should be fixed + debug_report_bug(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - AUTO-UNREGISTERED!'); } // END - if // Call the filter chain @@ -366,7 +371,7 @@ function loadExtensionFilters ($ext_name) { $GLOBALS[__FUNCTION__][$ext_name] = true; } elseif (isDebugModeEnabled()) { // Log missing file - logDebugMessage(__FUNCTION__, __LINE__, 'Include file ' . $incFileName . ' for extension ' . $ext_name . ' is missing.'); + logDebugMessage(__FUNCTION__, __LINE__, 'Filter include file ' . $incFileName . ' for extension ' . $ext_name . ' is missing.'); } } // END - if }