X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=c1e54c7c7de609f3f3dd569dc73e194c99ae71c9;hp=99152510cfab6c584613dbdae95b5fc9c002a32c;hb=00790481119eefa7a54a8dda1cb191fdf4f29226;hpb=74a607e3879faefdc2ca152605cb533806b98e83

diff --git a/inc/filters.php b/inc/filters.php
index 99152510cf..c1e54c7c7d 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -51,11 +51,12 @@ function FILTER_FLUSH_FILTERS () {
 		reportBug(__FUNCTION__, __LINE__, 'No database link is up. Cannot flush filters.');
 	} elseif ((isInstallationPhase()) && (!SQL_IS_LINK_UP())) {
 		// If the link is not up in installation phase, skip flushing filters
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters: No link is up.');
 		return;
 	}
 
-	// Is the extension ext-sql_patches updated and not in installation phase?
-	if ((!isInstallationPhase()) && ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9')))) {
+	// Is the extension ext-sql_patches updated?
+	if (((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) && (!isInstallationPhase())) {
 		// Log only in debug mode
 		if (isDebugModeEnabled()) {
 			logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, ext-sql_patches might be missing. isExtensionInstalled()=' . intval(isExtensionInstalled('sql_patches')) . ',isExtensionInstalledAndOlder()=' . intval(isExtensionInstalledAndOlder('sql_patches', '0.5.9')));
@@ -78,21 +79,30 @@ function FILTER_FLUSH_FILTERS () {
 		// Walk through all filters
 		foreach ($filterArray as $filterFunction => $active) {
 			// Is this filter loaded?
-			//* DEBUG: */ debugOutput('FOUND:'.$filterName.'/'.$filterFunction.'='.$active);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'FOUND:'.$filterName.'/'.$filterFunction.'='.$active);
 			if (((!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) && ($active != 'R')) || ($active == 'A')) {
-				// Add this filter (all filters are active by default)
-				//* DEBUG: */ debugOutput('ADD:'.$filterName.'/'.$filterFunction);
-				$insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
-				$inserted++;
+				// Is this filter already in database?
+				if (countSumTotalData($filterFunction, 'filters', 'filter_name', 'filter_function', TRUE, sprintf(" AND `filter_name`='%s'", SQL_ESCAPE($filterName))) == 0) {
+					// Add this filter (all filters are active by default)
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD:'.$filterName.'/'.$filterFunction);
+					$insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
+					$inserted++;
+				} elseif (isDebugModeEnabled()) {
+					// Log already registered filters
+					logDebugMessage(__FUNCTION__, __LINE__, 'Already registered: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',active=' . $active);
+				}
 			} elseif ($active == 'R') {
 				// Remove this filter
-				//* DEBUG: */ debugOutput('REMOVE:'.$filterName.'/'.$filterFunction);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE:'.$filterName.'/'.$filterFunction);
 				$removeSQL .= sprintf(" (`filter_name`='%s' AND `filter_function`='%s') OR", $filterName, $filterFunction);
 				$removed++;
 			}
 		} // END - foreach
 	} // END - foreach
 
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'inserted=' . $inserted . ',removed=' . $removed . ' - AFTER COLLECTION');
+
 	// Something has been added?
 	if ($inserted > 0) {
 		// Finish SQL command and add it
@@ -147,21 +157,6 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($filterData) {
 	return $content;
 }
 
-// Filter for redirecting to logout if ext-sql_patches has been installed
-function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
-	// Remove this filter
-	unregisterFilter(__FUNCTION__, __LINE__, 'shutdown', __FUNCTION__);
-
-	// Is the element set?
-	if (isset($GLOBALS['ext_load_mode'])) {
-		// Redirect here
-		redirectToUrl('modules.php?module=admin&logout=1&' . $GLOBALS['ext_load_mode'] . '=sql_patches');
-	} // END - if
-
-	// This should not happen!
-	logDebugMessage(__FUNCTION__, __LINE__, 'Cannot auto-logout because no extension load-mode has been set.');
-}
-
 // Filter for auto-activation of a extension
 function FILTER_AUTO_ACTIVATE_EXTENSION ($filterData) {
 	// Debug message
@@ -271,8 +266,8 @@ function FILTER_RUN_SQLS ($filterData) {
 
 				// Is there still a query left?
 				if (!empty($sql)) {
-					// Is there an "ALTER TABLE" command?
-					if (substr(strtolower($sql), 0, 11) == 'alter table') {
+					// Is there an "ALTER TABLE" command? Exclude installation phase here as it would cause this query to fail
+					if ((substr(strtolower($sql), 0, 11) == 'alter table') && (!isset($filterData['ext_installing']))) {
 						// Analyse the alteration command
 						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($filterData['enable_codes']));
 						SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $filterData['enable_codes']);
@@ -295,9 +290,6 @@ function FILTER_RUN_SQLS ($filterData) {
 	// Debug message
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
 
-	// Clear any SQL queries
-	//initSqls();
-
 	// Return counter
 	return $count;
 }
@@ -355,6 +347,9 @@ function FILTER_INIT_RANDOMIZER () {
 	// Take a prime number which is long (if you know a longer one please try it out!)
 	setConfigEntry('_PRIME', 591623);
 
+	// Initialize array with all allowed chars
+	$GLOBALS['_abc'] = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,1,2,3,4,6,7,8,9,-,+,_,/,.');
+
 	// Only execute this filter if installed
 	if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) {
 		// Set missing entry
@@ -554,13 +549,13 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) {
 				$filterData = call_user_func($etiFunction, $data);
 			} else {
 				// Unsupported command detected
-				logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ', callback=' . $callback . ', extra=' . $extraFunction . ' - unsupported');
+				logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ',etiFunction=' . $etiFunction . ',callback=' . $callback . ',extraFunction=' . $extraFunction . ',extraFunction2=' . $extraFunction2 . ' - UNSUPPORTED');
 			}
 		} // END - foreach
 	} // END - if
 
-	// Is there non-HTML mode?
-	if (!isHtmlOutputMode()) {
+	// Is there non-HTML/AJAX mode?
+	if ((!isHtmlOutputMode()) && (!isAjaxOutputMode())) {
 		$filterData = decodeEntities($filterData);
 	} // END - if
 
@@ -588,67 +583,97 @@ function FILTER_RUN_HOURLY_INCLUDES () {
 	// Is the reset set or old sql_patches?
 	if (((!isHourlyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) && (isHtmlOutputMode())) {
 		// Then abort here
-		reportBug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isHourlyResetEnabled()).',ext_newer[sql_patches:0.7.5]='.intval(isExtensionInstalledAndNewer('sql_patches', '0.7.5')).' Please report this bug. Thanks');
+		reportBug(__FUNCTION__, __LINE__, 'Cannot run hourly reset! enabled='.intval(isHourlyResetEnabled()).',ext='.intval(isExtensionInstalledAndNewer('sql_patches', '0.9.8')).' Please report this bug. Thanks');
 	} // END - if
 
-	// Get more hourly reset scripts
-	setIncludePool('hourly', getArrayFromDirectory('inc/hourly/', 'hourly_'));
+	// Is the config entry set?
+	if (isExtensionInstalledAndNewer('sql_patches', '0.7.5')) {
+		// Get more hourly reset scripts
+		setIncludePool('hourly', getArrayFromDirectory('inc/hourly/', 'hourly_'));
 
-	// Update database
-	if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) {
-		updateConfiguration('last_hour', getHour());
-	} // END - if
+		// Update database
+		if ((!isConfigEntrySet('DEBUG_HOURLY')) || (!isDebugHourlyEnabled())) {
+			updateConfiguration('last_hourly', getHour());
+		} // END - if
 
-	// Run the filter
-	runFilterChain('load_includes', 'hourly');
+		// Run the filter
+		runFilterChain('load_includes', 'hourly');
+	} // END - if
 }
 
-// Load more reset scripts
-function FILTER_RUN_RESET_INCLUDES () {
+// Load more daily scripts
+function FILTER_RUN_DAILY_INCLUDES () {
 	// Is the reset set or old sql_patches?
-	if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (isHtmlOutputMode())) {
+	if (((!isDailyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) && (isHtmlOutputMode())) {
 		// Then abort here
-		reportBug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks');
+		reportBug(__FUNCTION__, __LINE__, 'Cannot run daily reset! enabled='.intval(isDailyResetEnabled()).',ext='.intval(isExtensionInstalledAndNewer('sql_patches', '0.9.8')).' Please report this bug. Thanks');
 	} // END - if
 
 	// Get more daily reset scripts
-	setIncludePool('reset', getArrayFromDirectory('inc/daily/', 'daily_'));
+	setIncludePool('daily', getArrayFromDirectory('inc/daily/', 'daily_'));
 
 	// Update configuration if this reset is not being debugged
-	if (!isDebugResetEnabled()) {
-		updateConfiguration('last_update', 'UNIX_TIMESTAMP()');
+	if (!isDebugDailyEnabled()) {
+		updateConfiguration('last_daily', getDay());
+	} // END - if
+
+	// Run the filter
+	runFilterChain('load_includes', 'daily');
+}
+
+// Load more weeklt scripts
+function FILTER_RUN_WEEKLY_INCLUDES () {
+	// Is the reset set or old sql_patches?
+	if (((!isWeeklyResetDebugEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) && (isHtmlOutputMode())) {
+		// Then abort here
+		reportBug(__FUNCTION__, __LINE__, 'Cannot run weekly reset! enabled='.intval(isWeeklyResetDebugEnabled()).',ext='.intval(isExtensionInstalledAndNewer('sql_patches', '0.9.8')).' Please report this bug. Thanks');
 	} // END - if
 
 	// Is the config entry set?
 	if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) {
 		// Has it changed?
-		if (((isConfigEntrySet('last_week')) && (getConfig('last_week') != getWeek())) || (isWeeklyResetDebugEnabled())) {
+		if (((isConfigEntrySet('last_weekly')) && (getLastWeekly() != getWeek())) || (isWeeklyResetDebugEnabled())) {
 			// Include weekly reset scripts
-			mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
+			setIncludePool('weekly', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
 			// Update configuration if this reset is not being debugged
 			if (!isWeeklyResetDebugEnabled()) {
-				updateConfiguration('last_week', getWeek());
+				updateConfiguration('last_weekly', getWeek());
 			} // END - if
 		} // END - if
 
+		// Run the filter
+		runFilterChain('load_includes', 'weekly');
+	} // END - if
+}
+
+// Load more monthly scripts
+function FILTER_RUN_MONTHLY_INCLUDES () {
+	// Is the reset set or old sql_patches?
+	if (((!isMonthlyResetDebugEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) && (isHtmlOutputMode())) {
+		// Then abort here
+		reportBug(__FUNCTION__, __LINE__, 'Cannot run monthly reset! enabled='.intval(isMonthlyResetDebugEnabled()).',ext='.intval(isExtensionInstalledAndNewer('sql_patches', '0.9.8')).' Please report this bug. Thanks');
+	} // END - if
+
+	// Is the config entry set?
+	if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) {
 		// Create current month mark
 		$currMonth = getMonth();
 
 		// Has it changed?
-		if ((getLastMonth() != $currMonth) || (isMonthlyResetDebugEnabled())) {
+		if ((getLastMonthly() != $currMonth) || (isMonthlyResetDebugEnabled())) {
 			// Include monthly reset scripts
-			mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
+			setIncludePool('monthly', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
 			// Update configuration if this reset is not being debugged
 			if (!isMonthlyResetDebugEnabled()) {
-				updateConfiguration('last_month', $currMonth);
+				updateConfiguration('last_monthly', $currMonth);
 			} // END - if
 		} // END - if
 	} // END - if
 
 	// Run the filter
-	runFilterChain('load_includes', 'reset');
+	runFilterChain('load_includes', 'monthly');
 }
 
 // Filter for removing the given extension
@@ -666,8 +691,17 @@ function FILTER_REMOVE_EXTENSION () {
 
 // Filter for flushing the output
 function FILTER_FLUSH_OUTPUT () {
+	// Is this filter called?
+	if (isset($GLOBALS[__FUNCTION__])) {
+		// Abort here
+		reportBug(__FUNCTION__, __LINE__, 'Double call of ' . __FUNCTION__ . ' causes problems with sent headers.');
+	} // END - if
+
+	// Mark this filter as called
+	$GLOBALS[__FUNCTION__] = TRUE;
+
 	// Simple, he?
-	outputHtml('');
+	outputHtml();
 }
 
 // Prepares an SQL statement part for HTML mail and/or holiday dependency
@@ -705,6 +739,12 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 	if ((!isCssOutputMode()) && (!isRawOutputMode())) {
 		// Fix module
 		if (!isModuleSet()) {
+			// Is the module registered?
+			if (!isModuleRegistered(getRequestElement('module'))) {
+				// Is not a valid module
+				redirectToUrl('modules.php?module=index');
+			} // END - if
+
 			// Is the request element set?
 			if (isGetRequestElementSet('module')) {
 				// Set module from request
@@ -762,6 +802,7 @@ function FILTER_TRIGGER_SENDING_POOL () {
 	// Are we in normal output mode?
 	if (!isHtmlOutputMode()) {
 		// Only in normal output mode to prevent race-conditons!
+		return;
 	} // END - if
 
 	// Init counter
@@ -781,7 +822,9 @@ function FILTER_TRIGGER_SENDING_POOL () {
 // Filter for checking and updating SVN revision
 function FILTER_CHECK_REPOSITORY_REVISION () {
 	// Only execute this filter if installed and all config entries are there
-	if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) return;
+	if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) {
+		return;
+	} // END - if
 
 	// Check for patch level differences between database and current hard-coded
 	if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
@@ -792,31 +835,59 @@ function FILTER_CHECK_REPOSITORY_REVISION () {
 	} // END - if
 }
 
+// Filter for running hourly reset
+function FILTER_RUN_HOURLY_RESET () {
+	// Only execute this filter if installed
+	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) {
+		return;
+	} // END - if
+
+	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
+	if (((getLastHourly() != getHour()) || (isDebugHourlyEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('setup')) && (!isCssOutputMode())) {
+		// Tell every module we are in reset-mode!
+		doHourly();
+	} // END - if
+}
+
 // Filter for running daily reset
 function FILTER_RUN_DAILY_RESET () {
 	// Only execute this filter if installed
-	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) {
+	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) {
 		return;
 	} // END - if
 
 	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-	if (((getDay(getConfig('last_update')) != getDay()) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) {
+	if (((getLastDaily() != getDay()) || (isDebugDailyEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('setup')) && (!isCssOutputMode())) {
 		// Tell every module we are in reset-mode!
-		doReset();
+		doDaily();
 	} // END - if
 }
 
-// Filter for running hourly reset
-function FILTER_RUN_HOURLY_RESET () {
+// Filter for running weekly reset
+function FILTER_RUN_WEEKLY_RESET () {
 	// Only execute this filter if installed
-	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) {
+	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) {
 		return;
 	} // END - if
 
 	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-	if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) {
+	if (((getLastWeekly() != getWeek()) || (isDebugWeeklyEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('setup')) && (!isCssOutputMode())) {
 		// Tell every module we are in reset-mode!
-		doHourly();
+		doWeekly();
+	} // END - if
+}
+
+// Filter for running monthly reset
+function FILTER_RUN_MONTHLY_RESET () {
+	// Only execute this filter if installed
+	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.8'))) {
+		return;
+	} // END - if
+
+	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
+	if (((getLastMonthly() != getMonth()) || (isDebugMonthlyEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('setup')) && (!isCssOutputMode())) {
+		// Tell every module we are in reset-mode!
+		doMonthly();
 	} // END - if
 }
 
@@ -854,7 +925,10 @@ function FILTER_CHECK_ADMIN_ACL () {
 // Init random number/cache buster
 function FILTER_INIT_RANDOM_NUMBER () {
 	// Is the extension ext-sql_patches installed and at least 0.3.6?
-	if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
+	if (isSessionVariableSet('random_number')) {
+		// Then set it
+		setConfigEntry('RAND_NUMBER', getSession('random_number'));
+	} elseif ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
 		// Generate random number
 		setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 99999), getMemberId(), ''));
 	} else {
@@ -862,14 +936,23 @@ function FILTER_INIT_RANDOM_NUMBER () {
 		setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
 	}
 
+	// Set it in session for faster script execusion
+	setSession('random_number', getConfig('RAND_NUMBER'));
+
 	// Copy it to CACHE_BUSTER
 	setConfigEntry('CACHE_BUSTER', getConfig('RAND_NUMBER'));
 }
 
 // Update module counter
 function FILTER_COUNT_MODULE () {
+	// Is installation phase or no admin registered?
+	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered())) {
+		// Then don't count any modules
+		return;
+	} // END - if
+
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ' - ENTERED!');
-	// Do count all other modules but not accesses on CSS file css.php!
+	// Count module click
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `clicks`=`clicks`+1 WHERE `module`='%s' LIMIT 1",
 		array(getModule()), __FUNCTION__, __LINE__);
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - EXIT!');
@@ -960,7 +1043,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
 // Filter for displaying copyright line
 function FILTER_DISPLAY_COPYRIGHT () {
 	// Shall we display the copyright notice?
-	if ((isFullPage()) && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['__header_sent'] == 2) && (ifCopyrightFooterEnabled())) {
+	if ((isFullPage()) && ((getWriteFooter() == 'Y') || (isInstalling())) && ($GLOBALS['__header_sent'] == 2) && (ifCopyrightFooterEnabled())) {
 		// Backlink enabled?
 		if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) {
 			// Copyright with backlink, thanks! :-)
@@ -975,8 +1058,8 @@ function FILTER_DISPLAY_COPYRIGHT () {
 // Filter for displaying parsing time
 function FILTER_DISPLAY_PARSING_TIME () {
 	// Shall we display the parsing time and number of queries?
-	// 1234                            5                      54    4         5              5       4    4          5543    3                    4432    2                332    2                              21
-	if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (isFullPage())) && (!isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['__header_sent'] == 2)) {
+	// 1234                            5                      54    4                    554    4          5543    3                    4432    2                332    2                              21
+	if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (isShowTimingsEnabled()) && (isFullPage())) && (!isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['__header_sent'] == 2)) {
 		// Then display it here
 		displayParsingTime();
 	} // END - if
@@ -985,14 +1068,14 @@ function FILTER_DISPLAY_PARSING_TIME () {
 // Filter for flushing template cache
 function FILTER_FLUSH_TEMPLATE_CACHE () {
 	// Do not flush when debugging the template cache
-	if (isDebuggingTemplateCache()) {
+	if (isDebugTemplateCacheEnabled()) {
 		// Do not flush templates in debug-mode
 		return;
 	} // END - if
 
 	// Is there cached eval() data?
 	if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) {
-		// Now flush all
+		// Flush all
 		foreach ($GLOBALS['template_eval'] as $prefix => $templateArray) {
 			foreach ($templateArray as $template => $eval) {
 				// Flush the cache (if not yet found)
@@ -1004,19 +1087,23 @@ function FILTER_FLUSH_TEMPLATE_CACHE () {
 
 // Filter for loading user data
 function FILTER_FETCH_USER_DATA ($userid = NULL) {
-	// Is the userid not set? Then use member id
-	if (!isValidUserId($userid)) {
+	// Is the userid not set?
+	if (!isValidId($userid)) {
+		// Then use member id
 		$userid = getMemberId();
 	} // END - if
 
 	// Get user data
 	if (!fetchUserData($userid)) {
 		// Userid is not valid
-		reportBug(__FUNCTION__, __LINE__, 'User id '.$userid . ' is invalid.');
+		reportBug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
 	} // END - if
 
 	// Set member id
 	setMemberId($userid);
+
+	// Continue with next filter
+	return $userid;
 }
 
 // Filter for reseting users' last login failure, only available with latest ext-sql_patches
@@ -1067,12 +1154,12 @@ function FILTER_LOAD_PAGE_HEADER () {
 	$GLOBALS['__page_header'] = loadTemplate('page_header', TRUE);
 
 	// Include meta data in 'guest' module
-	if ((isModuleSet()) && (getModule() == 'index')) {
+	if (isModuleSet()) {
 		// Load meta data template
-		$GLOBALS['__page_header'] .= loadTemplate('metadata', TRUE);
+		$GLOBALS['__page_header'] .= loadTemplate(getMenuModeFromModule() . '_metadata', TRUE);
 
 		// Add meta description to header
-		if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
+		if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP()) && (getModule() == 'index')) {
 			// Add meta description not in admin and login module and when the script is installed
 			generateMetaDescriptionCode();
 		} // END - if
@@ -1123,8 +1210,8 @@ function FILTER_EXTENSION_MARK_INSTALLED ($filterData) {
 
 // Filter for generating mails links for 'pool' mails
 function FILTER_GENERATE_POOL_MAIL_LINKS ($filterData) {
-	// Is type 'mid'?
-	if ($filterData['type'] == 'mid') {
+	// Is type 'normal'?
+	if ($filterData['type'] == 'normal') {
 		// Load template
 		$filterData['__output'] .= loadTemplate('admin_links_' . strtolower($filterData['mail_status']) . '_pool_mail', TRUE, $filterData);
 	} // END - if
@@ -1135,8 +1222,8 @@ function FILTER_GENERATE_POOL_MAIL_LINKS ($filterData) {
 
 // Filter to activate exchange
 function FILTER_ACTIVATE_EXCHANGE () {
-	// Is the extension 'user' there?
-	if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) {
+	// Are the extension ext-user/other there?
+	if ((!isExtensionActive('user')) || (!isExtensionActive('other')) || (getActivateXchange() == '0')) {
 		// Silently abort here
 		return FALSE;
 	} // END - if
@@ -1238,7 +1325,7 @@ function FILTER_INIT_SESSION ($filterData) {
 // Filter for sending "build mail" to admin
 function FILTER_SEND_BUILD_MAIL ($filterData) {
 	// Was one line updated?
-	if ($filterData['affected'] > 0) {
+	if (($filterData['affected'] > 0) || (isDebugBuildMailsEnabled())) {
 		// Then call the proper function
 		call_user_func_array('sendGenericBuildMails', $filterData);
 	} // END - if
@@ -1247,5 +1334,136 @@ function FILTER_SEND_BUILD_MAIL ($filterData) {
 	return $filterData;
 }
 
+// Handles click on referral banner
+function FILTER_HANDLE_REFERRER_BANNER_CLICK ($filterData) {
+	// Check required parameters
+	if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) {
+		// Update clicks counter...
+		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1",
+			array(bigintval(getRequestElement('banner'))), __FUNCTION__, __LINE__);
+
+		// A line has been updated?
+		if ((!SQL_HASZEROAFFECTED()) && (isGetRequestElementSet('user'))) {
+			// Redirect to the user's referral link
+			redirectToUrl('ref.php?refid=' . bigintval(getRequestElement('user')));
+		} // END - if
+	} // END - if
+
+	// Return filter data
+	return $filterData;
+}
+
+// Filter for handling viewing of a referral banner
+function FILTER_HANDLE_REFERRER_BANNER_VIEW ($filterData) {
+	// Are all required parameters set
+	if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) {
+		// For later things... ;-)
+		$result = SQL_QUERY_ESC("SELECT `url` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1",
+			array(bigintval(getRequestElement('banner'))), __FUNCTION__, __LINE__);
+
+		// Is there the banner?
+		if (SQL_NUMROWS($result) == 1) {
+			// Load the URL
+			$data = SQL_FETCHARRAY($result);
+
+			// Update counter
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `counter`=`counter`+1 WHERE `id`=%s LIMIT 1",
+				array(bigintval(getRequestElement('banner'))), __FUNCTION__, __LINE__);
+
+			// Set header and ...
+			setContentType('image/' . substr($data['url'], -3, 3));
+
+			// Redirect
+			redirectToUrl($data['url'], FALSE);
+		} // END - if
+
+		// @TODO No banner found, output some default banner
+		logDebugMessage(__FUNCTION__, __LINE__, 'Banner ' . bigintval(getRequestElement('banner')) . ' not found.');
+
+		// Free memory
+		SQL_FREERESULT($result);
+	} // END - if
+
+	// Do nothing for now
+	redirectToUrl('modules.php?module=index');
+}
+
+// Filter for redirecting on wrong server name (e.g. bad.your-server.tld will be redirected to your-server.tld)
+function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) {
+	// Get URL
+	$url = getUrl();
+
+	// Is the configured URL same as SERVER_NAME?
+	if (extractHostnameFromUrl($url) != detectServerName()) {
+		// Log all attempts
+		logWrongServerNameRedirect();
+
+		// Then redirect to configured URL
+		redirectToRequestUri();
+	} // END - if
+
+	// Return filter data
+	return $filterData;
+}
+
+// Filter for adding hidden session id
+function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) {
+	// Is a spider detected?
+	if ((!isSpider()) && (!isSessionValid()) && ($filterData['__form_method'] == 'get')) {
+		// No, then add the hidden field
+		$filterData['__replacer'] .= '<input type="hidden" name="' . session_name() . '" value="' . session_id() . '" />';
+	} // END - if
+
+	// Return filter data
+	return $filterData;
+}
+
+// Filter for purging old SERVER_NAME entries
+function FILTER_SERVER_NAME_EXTRA_AUTOPURGE ($filterData) {
+	// Is purging configured?
+	if ((isApServerNameEnabled()) && (getApServerNameSince() > 0)) {
+		// Then start purging
+		SQL_QUERY('DELETE LOW_PRIORITY FROM
+	`{?_MYSQL_PREFIX?}_server_name_log`
+WHERE
+	(UNIX_TIMESTAMP() - UNIX_TIMESTAMP(`server_name_added`)) >= {?ap_server_name_since?}',
+			__FILE__, __LINE__);
+
+		// Are some entries deleted?
+		if (SQL_AFFECTEDROWS() > 0) {
+			// Okay, then send an email to the admin
+			sendAdminNotification('{--ADMIN_PURGE_USER_SERVER_NAME_LOG_SUBJECT--}', 'admin_purge_user_server_name_log', SQL_AFFECTEDROWS());
+		} // END - if
+	} // END - if
+
+	// Return filter data
+	return $filterData;
+}
+
+// Filter for detecting menu mode
+function FILTER_DETERMINE_MENU_MODE_GENERIC ($filterData) {
+	// "Detect" it
+	switch (getModule()) {
+		case 'confirm': // Login script is 'member'
+			$filterData = 'member';
+			break;
+	} // END - switch
+
+	// Return filter data
+	return $filterData;
+}
+
+// Filter to exclude default referral id
+function FILTER_EXCLUDE_DEFAULT_REFID ($filterData = array()) {
+	// Is it valid?
+	if (isValidId(getDefRefid())) {
+		// Exclude it
+		array_push($filterData, '{?def_refid?}');
+	} // END - if
+
+	// Return it
+	return $filterData;
+}
+
 // [EOF]
 ?>