X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=19d95e504bb874553eab155b279d322afcea64d7;hb=5ab0d021f3e96722af5d96d2b9036430200c06cb;hp=c75f48417eda2ff8170a372b6b188a324921d019;hpb=7052cc3bd3ca07281078acbbce6ce595d753def1;p=mailer.git

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index c75f48417e..19d95e504b 100644
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -114,6 +114,7 @@ ORDER BY
 	registerFilter(__FUNCTION__, __LINE__, 'init', 'RUN_HOURLY_RESET');
 	registerFilter(__FUNCTION__, __LINE__, 'init', 'RUN_DAILY_RESET');
 	registerFilter(__FUNCTION__, __LINE__, 'init', 'TRIGGER_SENDING_POOL');
+	// @TODO Remove this forced removal after a year or so
 	unregisterFilter(__FUNCTION__, __LINE__, 'init', 'DETERMINE_USERNAME', TRUE);
 	registerFilter(__FUNCTION__, __LINE__, 'init', 'DETERMINE_WHAT_ACTION');
 	registerFilter(__FUNCTION__, __LINE__, 'init', 'COUNT_MODULE');
@@ -217,7 +218,7 @@ function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = TR
 	$filterFunction = 'FILTER_' . strtoupper($filterFunction);
 
 	// Debug message with FILTER_ prefix
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',F=' . basename($F) . ',L=' . $L . ' - ENTERED!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',isDryRun=' . intval($isDryRun) . ',F=' . basename($F) . ',L=' . $L . ' - ENTERED!');
 
 	// Is that filter already there?
 	if ((isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === FALSE)) {
@@ -236,7 +237,7 @@ function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = TR
 		// Is the function there?
 		if (!function_exists($filterFunction)) {
 			// Then abort here
-			addFatalMessage(__FUNCTION__, __LINE__, sprintf("Filter function %s could not be added to filter chain %s. F=%s,L=%s,force=%d", $filterFunction, $filterName, basename($F), $L, intval($force)));
+			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Filter function %s could not be added to filter chain %s. F=%s,L=%s,force=%d", $filterFunction, $filterName, basename($F), $L, intval($force)));
 			return FALSE;
 		} // END - if
 
@@ -246,7 +247,10 @@ function registerFilter ($F, $L, $filterName, $filterFunction, $silentAbort = TR
 		$GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
 	} // END - if
 
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',F=' . basename($F) . ',L=' . $L . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',isDryRun=' . intval($isDryRun) . ',F=' . basename($F) . ',L=' . $L . ' - EXIT!');
+
+	// Worked
+	return TRUE;
 }
 
 // "Unregisters" a filter from the given chain
@@ -261,7 +265,7 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = FALSE,
 	// Is that filter there?
 	if ((!isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === FALSE)) {
 		// Not found, so abort here
-		addFatalMessage(__FUNCTION__, __LINE__, sprintf(getMessage('FILTER_FAILED_NOT_REMOVED'), $filterFunction, $filterName));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf('Filter function %s cannot be unregistered from filter %s.', $filterFunction, $filterName));
 		return FALSE;
 	} // END - if
 
@@ -273,6 +277,9 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = FALSE,
 	} // END - if
 
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',isDryRun=' . intval($isDryRun) . ' - EXIT!');
+
+	// Worked
+	return TRUE;
 }
 
 // "Runs" the given filters, filterData is optional and can be any type of data
@@ -309,7 +316,7 @@ function runFilterChain ($filterName, $filterData = NULL) {
 			} // END - if
 
 			// Call the filter chain
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName . '/' . $filterFunction . ',[]=' . gettype($returnValue));
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName . '/' . $filterFunction . ',[]=' . gettype($returnValue) . ' - CALLING!');
 			$returnValue = call_user_func_array($filterFunction, array($returnValue));
 
 			// Update usage counter