X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=1960dadff976e7530b416c28184d68e86169fc8b;hp=4d766f980ee59f7b7ad4e581242cd1390c7fdbc2;hb=5cf56305e05df061e2d3ef50f3019a8414aa6ca8;hpb=964a3b539e335f6d70e7779630fd3d25fd38398d

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 4d766f980e..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 *
@@ -58,7 +58,9 @@ function initFilterSystem () {
 	} elseif ((!isInstallationPhase()) && (isExtensionInstalledAndNewer('sql_patches', '0.5.9'))) {
 		// Init add
 		$add = '';
-		if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) $add = ", `filter_counter`";
+		if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) {
+			$add = ", `filter_counter`";
+		} // END - if
 
 		// Load all filters
 		$result = SQL_QUERY('SELECT
@@ -118,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');
@@ -133,6 +136,7 @@ ORDER BY
 	registerFilter('post_extension_installed', 'SOLVE_TASK');
 	registerFilter('post_extension_installed', 'LOAD_INCLUDES');
 	registerFilter('post_extension_installed', 'REMOVE_UPDATES');
+	registerFilter('post_extension_installed', 'EXTENSION_MARK_INSTALLED');
 
 	// Solving tasks
 	registerFilter('solve_task', 'SOLVE_TASK');
@@ -184,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
@@ -218,14 +225,17 @@ 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!');
 }
 
 // "Unregisters" a filter from the given chain
 function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false, $dry_run = false) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry_run=' . intval($dry_run) . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry_run=' . intval($dry_run) . ' - ENTERED!');
 
 	// Extend the filter function name only if not loaded from database
 	if (!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) {
@@ -242,15 +252,15 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false,
 	// Shall we remove? (default, not while just showing an extension removal)
 	if ($dry_run === false) {
 		// Mark for filter removal
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - REMOVE!');
 		$GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R';
 	} // END - if
 
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry_run=' . intval($dry_run) . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry_run=' . intval($dry_run) . ' - EXIT!');
 }
 
 // "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?
@@ -266,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
@@ -277,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
@@ -363,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
 }