X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=7c0296dad20c472114c501418ec3e4fc5c97a0f1;hb=4707e8e1d5511597b3d425bca0fd5addbb6fe2a8;hp=40b673459953cf94236751389be27d76c1762d81;hpb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;p=mailer.git

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 40b6734599..7c0296dad2 100644
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -47,7 +47,7 @@ function initFilterSystem () {
 	// Is the filter already initialized?
 	if (isset($GLOBALS['filter_init'])) {
 		// Then abort here
-		debug_report_bug('Filter system already initialized.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Filter system already initialized.');
 	} // END - if
 
 	// Load all saved filers if sql_patches is updated
@@ -185,7 +185,7 @@ ORDER BY
 
 // "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);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - ENTERED!');
 
 	// Extend the filter function name
 	$filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
@@ -195,7 +195,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
 		// In installation phase we always want to abort
 		if (($silentAbort === false) || (isInstallationPhase())) {
 			// Add fatal message
-			debug_report_bug(sprintf("[%s:%s] Filter chain %s has already filter function %s registered!", __FUNCTION__, __LINE__, $filterName, $filterFunction));
+			debug_report_bug(__FUNCTION__, __LINE__, sprintf("Filter chain %s has already filter function %s registered!", $filterName, $filterFunction));
 		} // END - if
 
 		// Abort here
@@ -216,11 +216,13 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
 		$GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'A';
 		$GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
 	} // END - if
+
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ' - EXIT!');
 }
 
 // "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));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - ENTERED!');
 
 	// Extend the filter function name only if not loaded from database
 	if (!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) {
@@ -240,10 +242,14 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: filterName=' . $filterName . ',filterFunction=' . $filterFunction);
 		$GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R';
 	} // END - if
+
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - EXIT!');
 }
 
 // "Runs" the given filters, data is optional and can be any type of data
 function runFilterChain ($filterName, $data = null) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',data[]=' . gettype($data) . ' - ENTERED!');
+
 	// Is that filter chain there?
 	if (!isset($GLOBALS['cache_array']['filter']['chains'][$filterName])) {
 		// Log not found filters in debug-mode
@@ -288,6 +294,7 @@ function runFilterChain ($filterName, $data = null) {
 	} // END - foreach
 
 	// Return the filtered content
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',data[]=' . gettype($data) . ',returnValue[]=' . gettype($returnValue) . ' - EXIT!');
 	return $returnValue;
 }