X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=0b07e67b7eec01c714a4e8d4944ab105e3c5f55b;hp=89af47dbfd6a1edc52f03a0a3af8c7c047ee8f83;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=d979fd0c393880233143e10b8ac6a6899f9db4c2

diff --git a/inc/filters.php b/inc/filters.php
index 89af47dbfd..0b07e67b7e 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -14,10 +14,9 @@
  * $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                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,7 +54,7 @@ function FILTER_FLUSH_FILTERS () {
 	// Is a database link here and not in installation mode?
 	if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
 		// Abort here
-		addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
+		addFatalMessage(__FUNCTION__, __LINE__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}');
 		return false;
 	} // END - if
 
@@ -70,23 +69,23 @@ function FILTER_FLUSH_FILTERS () {
 	$removed = '0';
 
 	// Prepare SQL queries
-	$insertSQL = "INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
-	$removeSQL = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE";
+	$insertSQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES';
+	$removeSQL = 'DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE';
 
 	// Write all filters to database
 	foreach ($GLOBALS['cache_array']['filter']['chains'] as $filterName => $filterArray) {
 		// Walk through all filters
 		foreach ($filterArray as $filterFunction => $active) {
 			// Is this filter loaded?
-			//* DEBUG: */ print 'FOUND:'.$filterName.'/'.$filterFunction.'='.$active.'<br />';
+			//* DEBUG: */ debugOutput('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: */ print 'ADD:'.$filterName.'/'.$filterFunction.'<br />';
+				//* DEBUG: */ debugOutput('ADD:'.$filterName.'/'.$filterFunction);
 				$insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
 				$inserted++;
 			} elseif ($active == 'R') {
 				// Remove this filter
-				//* DEBUG: */ print 'REMOVE:'.$filterName.'/'.$filterFunction.'<br />';
+				//* DEBUG: */ debugOutput('REMOVE:'.$filterName.'/'.$filterFunction);
 				$removeSQL .= sprintf(" (`filter_name`='%s' AND `filter_function`='%s') OR", $filterName, $filterFunction);
 				$removed++;
 			}
@@ -106,14 +105,14 @@ function FILTER_FLUSH_FILTERS () {
 	} // END - if
 
 	// Shall we update usage counters (ONLY FOR DEBUGGING!)
-	if (getConfig('update_filter_usage') == 'Y') {
+	if (isFilterUsageUpdateEnabled()) {
 		// Update all counters
 		foreach ($GLOBALS['cache_array']['filter']['counter'] as $filterName => $filterArray) {
 			// Walk through all filters
-			foreach ($filterArray as $filterFunction => $cnt) {
+			foreach ($filterArray as $filterFunction => $count) {
 				// Construct and add the query
 				addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
-					bigintval($cnt),
+					bigintval($count),
 					$filterName,
 					$filterFunction
 				));
@@ -127,7 +126,7 @@ function FILTER_FLUSH_FILTERS () {
 	// Should we rebuild cache?
 	if (($inserted > 0) || ($removed > 0)) {
 		// Destroy cache
-		rebuildCacheFile('filter', 'filter');
+		rebuildCache('filter', 'filter');
 	} // END - if
 }
 
@@ -137,10 +136,10 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 	$content = $data;
 
 	// Handle failed logins here if not in guest
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):type={$data['type']},action={getAction()},what={getWhat()},level={$data['access_level']}<br />");
-	if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "type=".$data['type'].",action=".getAction().",what=".getWhat().",level=".$data['access_level']."<br />");
+	if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
 		// Handle failure
-		$content['content'] .= handleLoginFailtures($data['access_level']);
+		$content['content'] .= handleLoginFailures($data['access_level']);
 	} // END - if
 
 	// Return the content
@@ -150,7 +149,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 // Filter for redirecting to logout if sql_patches has been installed
 function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
 	// Remove this filter
-	unregisterFilter('shutdown', __FUNCTION__);
+	unregisterFilter(__FUNCTION__, __LINE__, 'shutdown', __FUNCTION__);
 
 	// Is the element set?
 	if (isset($GLOBALS['ext_load_mode'])) {
@@ -164,10 +163,12 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
 
 // Filter for auto-activation of a extension
 function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $data['ext_name'] . ',isExtensionAlwaysActive()=' . intval(isExtensionAlwaysActive()));
+
 	// Is this extension always activated?
-	if (getExtensionAlwaysActive() == 'Y') {
+	if (isExtensionAlwaysActive()) {
 		// Then activate the extension
-		//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ext_name={$data['ext_name']}<br />");
 		doActivateExtension($data['ext_name']);
 	} // END - if
 
@@ -189,7 +190,7 @@ function FILTER_SOLVE_TASK ($data) {
 		adminSolveTask($data['task_id']);
 	} else {
 		// Not detectable!
-		debug_report_bug(sprintf("Cannot resolve task. data[%s]=<pre>%s</pre>", gettype($data), print_r($data, true)));
+		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Cannot resolve task. data[%s]=<pre>%s</pre>", gettype($data), print_r($data, true)));
 	}
 
 	// Return the data
@@ -201,7 +202,7 @@ function FILTER_LOAD_INCLUDES ($pool) {
 	// Is it null?
 	if (is_null($pool)) {
 		// This should not happen!
-		debug_report_bug('pool is null.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'pool is null.');
 	} // END - if
 
 	// Is the pool an array and 'pool' set?
@@ -219,7 +220,7 @@ function FILTER_LOAD_INCLUDES ($pool) {
 	// Is it an array?
 	if ((!isset($data)) || (!is_array($data))) {
 		// Then abort here
-		debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($data)));
+		debug_report_bug(__FUNCTION__, __LINE__, sprintf("INC_POOL is no array! Type: %s", gettype($data)));
 	} elseif (isset($data['inc_pool'])) {
 		// Use this as new inclusion pool!
 		setIncludePool($realPool, $data['inc_pool']);
@@ -241,29 +242,35 @@ function FILTER_LOAD_INCLUDES ($pool) {
 // Filter for running SQL commands
 function FILTER_RUN_SQLS ($data) {
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Entered!");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
 
 	// Is the array there?
 	if ((isSqlsValid()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
 		// Run SQL commands
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Found ".countSqls()." queries to run.");
-		foreach (getSqls() as $sqls) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
+		foreach (getSqls() as $mode=>$sqls) {
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',count()=' . count($sqls));
+
 			// New cache format...
 			foreach ($sqls as $sql) {
 				// Trim spaces away
 				$sql = trim($sql);
 
+				// Is 'enable_codes' not set? Then set it to true
+				if (!isset($data['enable_codes'])) $data['enable_codes'] = true;
+
 				// Is there still a query left?
 				if (!empty($sql)) {
 					// Do we have an "ALTER TABLE" command?
 					if (substr(strtolower($sql), 0, 11) == 'alter table') {
 						// Analyse the alteration command
-						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
-						SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__);
+						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($data['enable_codes']));
+						SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $data['enable_codes']);
 					} else {
 						// Run regular SQL command
-						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
-						SQL_QUERY($sql, __FUNCTION__, __LINE__, false);
+						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running regular query: ' . $sql . ',enable_codes=' . intval($data['enable_codes']));
+						SQL_QUERY($sql, __FUNCTION__, __LINE__, $data['enable_codes']);
 					}
 				} // END - if
 			} // END - foreach
@@ -271,7 +278,7 @@ function FILTER_RUN_SQLS ($data) {
 	} // END - if
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Left!");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
 }
 
 // Filter for updating/validating login data
@@ -303,7 +310,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
 		if (!isWhatSet()) {
 			// Fix it to default
 			setWhat('welcome');
-			if (getConfig('index_home') != '') setWhatFromConfig('index_home');
+			if (getIndexHome() != '') setWhatFromConfig('index_home');
 		} // END - if
 
 		// Update last module / online time
@@ -323,7 +330,7 @@ function FILTER_INIT_RANDOMIZER () {
 	setConfigEntry('_PRIME', 591623);
 
 	// Calculate "entropy" with the prime number (for code generation)
-	setConfigEntry('_ADD', (getConfig('_PRIME') * getConfig('_PRIME') / (pi() * getConfig('code_length') + 1)));
+	setConfigEntry('_ADD', (getPrime() * getPrime() / (pi() * getCodeLength() + 1)));
 
 	// Simply init the randomizer with seed and _ADD value
 	mt_srand(generateSeed() + getConfig('_ADD'));
@@ -347,7 +354,7 @@ function FILTER_REMOVE_UPDATES ($data) {
 			// Shall we remove this update?
 			if (in_array($ext_name, getExtensionRemovalList())) {
 				// Then remove this extension!
-				removeExtensionUpdateDependency($ext_name);
+				removeExtensionDependency($ext_name);
 			} // END - if
 		} // END - foreach
 	} // END - if
@@ -408,13 +415,13 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 					// Is the config valid?
 					if (isConfigEntrySet($matches[1][$key])) {
 						// Set it for caching
-						$GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . $matches[1][$key] . "').\"";
+						$GLOBALS['compile_config'][$matches[1][$key]] = '{%config=' . $matches[1][$key] . '%}';
 					} elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
 						// Use default value
-						$GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+						$GLOBALS['compile_config'][$matches[1][$key]] = '{%config=' . 'DEFAULT_' . strtoupper($matches[1][$key]) . '%}';
 					} elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
 						// No config, try the language system
-						$GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \"";
+						$GLOBALS['compile_config'][$matches[1][$key]] = '{%message,DEFAULT_' . strtoupper($matches[1][$key]) . '%}';
 					} else {
 						// Unhandled!
 						$GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
@@ -423,7 +430,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 
 				// Use this for replacing
 				$code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
-				//* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.secureString($code).'</pre>');
+				//* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die(__FUNCTION__.'['.__LINE__.']:<pre>'.secureString($code).'</pre>');
 			} // END - foreach
 		} // END - if
 
@@ -434,8 +441,8 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 	// Should we compile it?
 	if ($compiled === true) {
 		// Run the code
-		$eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";";
-		//* DEBUG: */ print('<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>');
+		$eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";';
+		//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>' . encodeEntities($eval) . '</pre>');
 		eval($eval);
 	} // END - if
 
@@ -443,72 +450,93 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 	return $GLOBALS['compiled_config'][$uncompiled];
 }
 
-// Filter for compiling extension data
-function FILTER_COMPILE_EXTENSION ($code) {
-	// Compile {%cmd=some_value%} to get extension data
-	// Support cmd is:
-	//   - version -> getExtensionVersion() call
-	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^\}]+))%\}/', $code, $matches);
-	//* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
+// Filter for compiling expression code
+function FILTER_COMPILE_EXPRESSION_CODE ($code) {
+	// Compile {%cmd,callback,extraFunction=some_value%} to get expression code snippets
+	// See switch() command below for supported commands
+	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
+	//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.print_r($matches, true).'</pre>');
 
-	// Default is from OUTPUT_HTML
-	$outputMode = getOutputMode();
+	// Default is from outputHtml()
+	$outputMode = getScriptOutputMode();
 
 	// Some entries found?
 	if ((count($matches) > 0) && (count($matches[3]) > 0)) {
 		// Replace all matches
 		foreach ($matches[2] as $key => $cmd) {
-			// Init replacer variable
-			$replacer = '';
-
-			// Is the extension installed or code provided?
-			// @TODO This whole if-block is very static
-			if ($cmd == 'code') {
-				// Code asked for
-				$replacer = "\" . getCode('" . $matches[3][$key] . "') . \"";
-			} elseif (substr($cmd, 0, 3) == 'url') {
-				// Do we have JS-mode?
-				if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
-
-				// Handle an URL here
-				$replacer = "\" . encodeUrl(\"" . $matches[3][$key] . "\", " . $outputMode . ") . \"";
-
-				// Replace it
-				$code = str_replace($matches[0][$key], $replacer, $code);
-
-				// And continue with next entry
-				continue;
-			} elseif (substr($cmd, 0 , 3) == 'ext') {
-				// Get the extension command
-				$extCmd = explode(',', $cmd);
-				$extCmd = $extCmd[1];
-
-				// Construct call-back function name
-				$functionName = 'getExtension' . ucfirst(strtolower($extCmd));
-
-				// Construct call of the function
-				$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
+			// Init replacer/call-back variable
+			$replacer       = '';
+			$callback       = '';
+			$extraFunction  = '';
+			$extraFunction2 = '';
+			$value          = null;
+
+			// Extract command and call-back
+			$cmdArray = explode(',', $cmd);
+			$cmd = $cmdArray[0];
+
+			// Detect call-back function
+			if (isset($cmdArray[1])) {
+				// Call-back function detected
+				$callback = $cmdArray[1];
+			} // END - if
+
+			// Detect extra function
+			if (isset($cmdArray[2])) {
+				// Also detected
+				$extraFunction = $cmdArray[2];
+			} // END - if
+
+			// Detect extra function 2
+			if (isset($cmdArray[3])) {
+				// Also detected
+				$extraFunction2 = $cmdArray[3];
+			} // END - if
+
+			// And value
+			if (isset($matches[4][$key])) {
+				// Use this as value
+				$value = $matches[4][$key];
+			} // END - if
+
+			// Construct call-back function name for the command
+			$commandFunction = 'doExpression' . capitalizeUnderscoreString($cmd);
+
+			// Is this function there?
+			if (function_exists($commandFunction)) {
+				// Prepare $matches, $key, $outputMode, etc.
+				$data = array(
+					'matches'     => $matches,
+					'key'         => $key,
+					'mode'        => $outputMode,
+					'code'        => $code,
+					'callback'    => $callback,
+					'extra_func'  => $extraFunction,
+					'extra_func2' => $extraFunction2,
+					'value'       => $value
+				);
+
+				// Call it
+				//* DEBUG: */ debugOutput(__FUNCTION__ . '[' . __LINE__ . ']: function=' . $commandFunction);
+				$code = call_user_func($commandFunction, $data);
 			} else {
-				// Unknown command detected
-				debug_report_bug('Unknown command ' . $cmd . ' detected.');
+				// Unsupported command detected
+				logDebugMessage(__FUNCTION__, __LINE__, 'Command cmd=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
 			}
-
-			// Replace it and insert parameter for GET request
-			$code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $cmd, $replacer), $code);
 		} // END - foreach
 	} // END - if
 
 	// Do we have non-HTML mode?
-	if ((getOutputMode() != '0') || ($outputMode != '0')) $code = html_entity_decode($code);
+	if ((!isHtmlOutputMode()) || ($outputMode != '0')) $code = decodeEntities($code);
 
 	// Return compiled code
-	//* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
+	//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.($code).'</pre>');
 	return $code;
 }
 
 // Runs some generic filter update steps
 function FILTER_UPDATE_EXTENSION_DATA ($ext_name) {
-	// Create task
+	// Create task (we ignore the task id here)
 	createExtensionUpdateTask(getCurrentAdminId(), $ext_name, $GLOBALS['update_ver'][$ext_name], SQL_ESCAPE(getExtensionNotes(getExtensionNotes())));
 
 	// Update extension's version
@@ -523,9 +551,9 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) {
 // Load more reset scripts
 function FILTER_RUN_RESET_INCLUDES () {
 	// Is the reset set or old sql_patches?
-	if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == '0')) {
+	if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (isHtmlOutputMode())) {
 		// Then abort here
-		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! Please report this bug. Thanks');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks');
 	} // END - if
 
 	// Get more daily reset scripts
@@ -537,27 +565,27 @@ function FILTER_RUN_RESET_INCLUDES () {
 	// Is the config entry set?
 	if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) {
 		// Create current week mark
-		$currWeek = date('W', time());
+		$currWeek = getWeek();
 
 		// Has it changed?
-		if ((getConfig('last_week') != $currWeek) || (getConfig('DEBUG_WEEKLY') == 'Y')) {
+		if ((getConfig('last_week') != $currWeek) || (isWeeklyResetDebugEnabled())) {
 			// Include weekly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
-			// Update config
-			if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek);
+			// Update config if not in debug mode
+			if (!isWeeklyResetDebugEnabled()) updateConfiguration('last_week', $currWeek);
 		} // END - if
 
 		// Create current month mark
-		$currMonth = date('m', time());
+		$currMonth = getMonth();
 
 		// Has it changed?
-		if ((getConfig('last_month') != $currMonth) || (getConfig('DEBUG_MONTHLY') == 'Y')) {
+		if ((getLastMonth() != $currMonth) || (isMonthlyResetDebugEnabled())) {
 			// Include monthly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
 			// Update config
-			if ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth);
+			if (!isMonthlyResetDebugEnabled()) updateConfiguration('last_month', $currMonth);
 		} // END - if
 	} // END - if
 
@@ -571,11 +599,11 @@ function FILTER_REMOVE_EXTENSION () {
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
 		array(getCurrentExtensionName()), __FUNCTION__, __LINE__);
 
-	// Remove the extension from global cache array as well
+	// Remove the extension from cache array as well
 	removeExtensionFromArray();
 
 	// Remove the cache
-	rebuildCacheFile('extension', 'extension');
+	rebuildCache('extension', 'extension');
 }
 
 // Filter for flushing the output
@@ -591,7 +619,7 @@ function FILTER_HTML_INCLUDE_USERS ($mode) {
 
 	// HTML mail?
 	if ($mode == 'html') $MORE = " AND `html`='Y'";
-	if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 		// Add something for the holiday extension
 		$MORE .= " AND `holiday_active`='N'";
 	} // END - if
@@ -613,14 +641,14 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 	} // END - if
 
 	// Get all values
-	if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
+	if ((!isCssOutputMode()) && (!isRawOutputMode())) {
 		// Fix module
 		if (!isModuleSet()) {
 			// Is the request element set?
-			if (isGetRequestElementSet('module')) {
+			if (isGetRequestParameterSet('module')) {
 				// Set module from request
-				setModule(getRequestElement('module'));
-			} elseif (getOutputMode() == '0') {
+				setModule(getRequestParameter('module'));
+			} elseif (isHtmlOutputMode()) {
 				// Set default module 'index'
 				setModule('index');
 			} else {
@@ -630,10 +658,14 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 		} // END - if
 
 		// Fix 'what' if not yet set
-		if (!isWhatSet())   setWhat(getWhatFromModule(getModule()));
+		if (!isWhatSet()) {
+			setWhat(getWhatFromModule(getModule()));
+		} // END - if
 
 		// Fix 'action' if not yet set
-		if (!isActionSet()) setAction(getModeAction(getModule(), getWhat()));
+		if (!isActionSet()) {
+			setAction(getActionFromModuleWhat(getModule(), getWhat()));
+		} // END - if
 	} else {
 		// Set action/what to empty
 		setAction('');
@@ -641,11 +673,11 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 	}
 
 	// Set default 'what' value
-	//* DEBUG: */ outputHtml('-'.getModule().'/'.getWhat()."-<br />");
-	if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+	//* DEBUG: */ debugOutput('-' . getModule() . '/' . getWhat() . '-');
+	if ((!isWhatSet()) && (!isActionSet()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
 		if (getModule() == 'admin') {
 			// Set 'action' value to 'login' in admin menu
-			setAction(getModeAction(getModule(), getWhat()));
+			setAction(getActionFromModuleWhat(getModule(), getWhat()));
 		} elseif ((getModule() == 'index') || (getModule() == 'login')) {
 			// Set 'what' value to 'welcome' in guest and member menu
 			setWhatFromConfig('index_home');
@@ -659,7 +691,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 // Sends out pooled mails
 function FILTER_TRIGGER_SENDING_POOL () {
 	// Are we in normal output mode?
-	if (getOutputMode() != 0) {
+	if (!isHtmlOutputMode()) {
 		// Only in normal output mode to prevent race-conditons!
 	} // END - if
 
@@ -678,15 +710,15 @@ function FILTER_TRIGGER_SENDING_POOL () {
 }
 
 // Filter for checking and updating SVN revision
-function FILTER_CHECK_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;
 
 	// Check for patch level differences between databases and current hard-coded
-	if ((getConfig('CURR_SVN_REVISION') > getConfig('patch_level')) || (getConfig('patch_level') == 'CURR_SVN_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
+	if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
 		// Update database and CONFIG array
-		updateConfiguration(array('patch_level', 'patch_ctime'), array(getConfig('CURR_SVN_REVISION'), 'UNIX_TIMESTAMP()'));
-		setConfigEntry('patch_level', getConfig('CURR_SVN_REVISION'));
+		updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrentRepositoryRevision(), 'UNIX_TIMESTAMP()'));
+		setConfigEntry('patch_level', getCurrentRepositoryRevision());
 		setConfigEntry('patch_ctime', time());
 	} // END - if
 }
@@ -694,11 +726,10 @@ function FILTER_CHECK_SVN_REVISION () {
 // Filter for running daily reset
 function FILTER_RUN_DAILY_RESET () {
 	// Only execute this filter if installed
-	if ((!isInstalled()) || (!isAdminRegistered())) return;
+	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return;
 
 	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-	// 012    3              4             43        3         4432    2         3             3       21    1                    221    1                 221    1                  2          21    1             22     10
-	if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (getOutputMode() != 1)) {
+	if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) {
 		// Tell every module we are in reset-mode!
 		doReset();
 	} // END - if
@@ -711,14 +742,6 @@ function FILTER_LOAD_RUNTIME_INCLUDES () {
 		// Load the include
 		loadIncludeOnce($inc);
 	} // END - foreach
-
-	// Load admin include file if he is admin
-	if (isAdmin()) {
-		// Administrative functions
-		loadIncludeOnce('inc/modules/admin/admin-inc.php');
-	} // END - if
-	//* DEBUG: */ addPointsThroughReferalSystem('test', 36, 1000);
-	//* DEBUG: */ die();
 }
 
 // Filter for checking admin ACL
@@ -732,7 +755,7 @@ function FILTER_CHECK_ADMIN_ACL () {
 		$action = getAction();
 		if (isWhatSet()) {
 			// Get action value by what-value
-			$action = getModeAction('admin', getWhat());
+			$action = getActionFromModuleWhat('admin', getWhat());
 		} // END - if
 
 		// Check for access control line of current menu entry
@@ -750,7 +773,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
 		// Generate random number
 		setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
 	} else {
-		// Generate weak (!!!) code
+		// Generate *WEAK* code
 		setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
 	}
 
@@ -768,7 +791,7 @@ function FILTER_COUNT_MODULE () {
 // Handles fatal errors
 function FILTER_HANDLE_FATAL_ERRORS () {
 	// Do we have errors to handle and right output mode?
-	if ((getTotalFatalErrors() == '0') || (getOutputMode() != 0)) {
+	if ((!ifFatalErrorsDetected()) || (!isHtmlOutputMode())) {
 		// Abort executing here
 		return false;
 	} // END - if
@@ -821,11 +844,11 @@ function FILTER_HANDLE_FATAL_ERRORS () {
 	}
 
 	// Message to regular users (non-admin)
-	$CORR = getMessage('FATAL_REPORT_ERRORS');
+	$CORR = '{--FATAL_REPORT_ERRORS--}';
 
 	// PHP warnings fixed
 	if ($check == 'done') {
-		if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
+		if (isAdmin()) $CORR = '{--FATAL_CORRECT_ERRORS--}';
 	} // END - if
 
 	// Remember all in array
@@ -853,14 +876,14 @@ function FILTER_HANDLE_FATAL_ERRORS () {
 // Filter for displaying copyright line
 function FILTER_DISPLAY_COPYRIGHT () {
 	// Shall we display the copyright notice?
-	if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
+	if ((!isGetRequestParameterSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
 		// Backlink enabled?
 		if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) {
 			// Copyright with backlink, thanks! :-)
-			loadTemplate('copyright_backlink');
+			$GLOBALS['page_footer'] .= loadTemplate('copyright_backlink', true);
 		} else {
 			// No backlink in Copyright note
-			loadTemplate('copyright');
+			$GLOBALS['page_footer'] .= loadTemplate('copyright', true);
 		}
 	} // END - if
 }
@@ -869,7 +892,7 @@ function FILTER_DISPLAY_COPYRIGHT () {
 function FILTER_DISPLAY_PARSING_TIME () {
 	// Shall we display the parsing time and number of queries?
 	// 1234                            5                      54    4         5              5       4    4                       5       543    3                   4432    2             33     2    2                              21
-	if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
+	if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['header_sent'] == 2)) {
 		// Then display it here
 		displayParsingTime();
 	} // END - if
@@ -898,7 +921,7 @@ function FILTER_FETCH_USER_DATA ($userid = 0) {
 	// Get user data
 	if (!fetchUserData($userid)) {
 		// Userid is not valid
-		debug_report_bug('User id '.$userid . ' is invalid.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'User id '.$userid . ' is invalid.');
 	} // END - if
 
 	// Set member id
@@ -910,7 +933,7 @@ function FILTER_RESET_USER_LOGIN_FAILURE () {
 	// Is the user data valid?
 	if (!isMember()) {
 		// Do only run for logged in members
-		debug_report_bug('Please only run this filter for logged in users.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
 	} // END - if
 
 	// Remmeber login failures if available
@@ -924,13 +947,82 @@ SET
 WHERE
 	`userid`=%s
 LIMIT 1",
-			array(getMemberId()), __FILE__, __LINE__);
+			array(getMemberId()), __FUNCTION__, __LINE__);
 
 		// Store it in session
-		setSession('mxchange_member_failures' , getUserData('login_failures'));
-		setSession('mxchange_member_last_fail', getUserData('last_failure'));
+		setSession('mailer_member_failures' , getUserData('login_failures'));
+		setSession('mailer_member_last_failure', getUserData('last_failure'));
+	} // END - if
+}
+
+// Try to login the admin by setting some session/cookie variables
+function FILTER_DO_LOGIN_ADMIN ($data) {
+	// Now set all session variables and store the result for later processing
+	$GLOBALS['admin_login_success'] = ((
+		setSession('admin_md5', encodeHashForCookie($data['pass_hash']))
+	) && (
+		setSession('admin_id', $data['id'])
+	) && (
+		setSession('admin_last', time())
+	));
+
+	// Return the data for further processing
+	return $data;
+}
+
+// Filter for loading page header, this should be ran first!
+function FILTER_LOAD_PAGE_HEADER () {
+	// Output page header code
+	$GLOBALS['page_header'] = loadTemplate('page_header', true);
+
+	// Include meta data in 'guest' module
+	if (getModule() == 'index') {
+		// Load meta data template
+		$GLOBALS['page_header'] .= loadTemplate('metadata', true);
+
+		// Add meta description to header
+		if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
+			// Add meta description not in admin and login module and when the script is installed
+			generateMetaDescriptionCode();
+		} // END - if
+	} // END - if
+}
+
+// Filter for adding style sheet, closing page header
+function FILTER_FINISH_PAGE_HEADER () {
+	// Include stylesheet
+	loadIncludeOnce('inc/stylesheet.php');
+
+	// Closing HEAD tag
+	$GLOBALS['page_header'] .= '</head>';
+}
+
+// Cleans up the DNS cache if sql_patches is at least 0.7.0
+function FILTER_CLEANUP_DNS_CACHE () {
+	// Is the latest version installed?
+	if (isExtensionInstalledAndNewer('sql_patches', '0.7.0')) {
+		// Load class file
+		loadIncludeOnce('inc/classes/resolver.class.php');
+
+		// Instance the resolver
+		$resolver = new HostnameResolver();
+
+		// Purge entries
+		$resolver->purgeEntries();
+
+		// Cute, isn't it? ;-)
 	} // END - if
 }
 
+// Filter for setting CURRENT_DATE, this is required after initialization of extensions
+function FILTER_SET_CURRENT_DATE () {
+	// Set current date
+	setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3'));
+
+	// Timestamp for yesterday, today ... all at 00:00 am
+	setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getOneDay()));
+	setConfigEntry('START_TDAY', makeTime(0, 0, 0, time()));
+}
+
 // [EOF]
 ?>