X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=a894e0e77c455b11a8c72b60b5c3ef9963fd128d;hb=15b33f67108fcf717fc56fc9cb931f7c22a69737;hp=22a2d5231f7782f184568dcb4de50056d1c7aedd;hpb=b3444a277f5be904b5a868e215c5c2ffbfea1954;p=mailer.git diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 22a2d5231f..a894e0e77c 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 * @@ -59,12 +59,15 @@ function initFilterSystem () { // Init add $add = ''; if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) { - $add = ", `filter_counter`"; + $add = ',`filter_counter`'; } // END - if // Load all filters $result = SQL_QUERY('SELECT - `filter_name`,`filter_function`,`filter_active`' . $add . ' + `filter_name`, + `filter_function`, + `filter_active` + ' . $add . ' FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY @@ -120,12 +123,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'); @@ -256,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? @@ -272,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,14 +285,11 @@ function runFilterChain ($filterName, $filterData = null) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running: name=' . $filterName . ',func=' . $filterFunction . ',active=' . $active); // Is the filter active or newly added?? - if (($active == 'Y') || ($active == 'A') || ((in_array($filterName, array('shutdown','extension_remove','post_extension_run_sql'))) && ($active == 'R'))) { + 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 @@ -369,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 }