X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=d91d5d6ea6e12a9ff1c7f03637205c249d16d65b;hb=8d2c9b91eb82ea74fac58b2541982f760d0f77fc;hp=40b673459953cf94236751389be27d76c1762d81;hpb=32777262b436bb0a6141a39b0b2a7ccde5f2630f;p=mailer.git

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 40b6734599..d91d5d6ea6 100644
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -47,7 +45,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
@@ -63,15 +61,15 @@ function initFilterSystem () {
 		if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) $add = ", `filter_counter`";
 
 		// Load all filters
-		$result = SQL_QUERY("SELECT
-	`filter_name`,`filter_function`,`filter_active`".$add."
+		$result = SQL_QUERY('SELECT
+	`filter_name`,`filter_function`,`filter_active`' . $add . '
 FROM
 	`{?_MYSQL_PREFIX?}_filters`
 ORDER BY
-	`filter_id` ASC", __FUNCTION__, __LINE__);
+	`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
@@ -104,8 +102,9 @@ ORDER BY
 	registerFilter('init', 'INIT_RANDOMIZER');
 	registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
 	registerFilter('init', 'INIT_EXTENSIONS');
+	registerFilter('init', 'SET_CURRENT_DATE');
 	registerFilter('init', 'INIT_RANDOM_NUMBER');
-	registerFilter('init', 'CHECK_SVN_REVISION');
+	registerFilter('init', 'CHECK_REPOSITORY_REVISION');
 	registerFilter('init', 'RUN_DAILY_RESET');
 	registerFilter('init', 'TRIGGER_SENDING_POOL');
 	registerFilter('init', 'DETERMINE_USERNAME');
@@ -122,7 +121,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
@@ -185,7 +184,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 +194,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 +215,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));
+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])) {
@@ -237,13 +238,17 @@ 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: 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
 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
@@ -269,7 +274,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;
@@ -288,6 +293,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;
 }