X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=d0e881ae8cd698d221e5faf3abc38f18174a3996;hp=39b7558bfd7e97c65d09e423c282a37e5ea49c9d;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=8cd3d68a23aa285f2fe149698a46cf8b4e3ac0ca

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 39b7558bfd..d0e881ae8c 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
@@ -71,7 +71,7 @@ ORDER BY
 	`filter_id` ASC", __FUNCTION__, __LINE__);
 
 		// Are there entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Load all filters
 			while ($filterArray = SQL_FETCHARRAY($result)) {
 				// Get filter name and function
@@ -122,7 +122,7 @@ ORDER BY
 	registerFilter('post_page_header', 'FINISH_PAGE_HEADER');
 	// ------------------- LAST FILTER FOR THIS CHAIN! ------------------------
 
-	// Login failures handler
+	// 'You are here' navigation - post filter
 	registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
 
 	// Filters for pre-extension-registration
@@ -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
@@ -221,8 +221,8 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
 }
 
 // "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) . ' - ENTERED!');
+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=' . intval($dry_run) . ' - ENTERED!');
 
 	// Extend the filter function name only if not loaded from database
 	if (!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) {
@@ -239,11 +239,11 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
 	// Shall we remove? (default, not while just showing an extension removal)
 	if ($dry_run === false) {
 		// Mark for filter removal
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: filterName=' . $filterName . ',filterFunction=' . $filterFunction);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: F=' . $F . ',L=' . $L . ',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!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: F=' . $F . ',L=' . $L . ',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
@@ -275,7 +275,7 @@ function runFilterChain ($filterName, $data = null) {
 			// Is this filter there?
 			if (!function_exists($filterFunction)) {
 				// Unregister it
-				unregisterFilter($filterName, $filterFunction);
+				unregisterFilter(__FUNCTION__, __LINE__, $filterName, $filterFunction);
 
 				// Skip this entry
 				continue;