X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=8970f8ea32a71dcd71a9f1ce51849a45709502db;hb=2eb01731e9a7a21c1b44ca5881a1444a801f5e5a;hp=fab11f202f6bb03bcebe0187de8b31dfba784e04;hpb=16de7d9e8b98108627db01688bc095240b5ba8d2;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index fab11f202f..8970f8ea32 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/16/2008 *
- * ===============                              Last change: 12/16/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 12/16/2008 *
+ * ===================                          Last change: 12/16/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : filters.php                                      *
@@ -66,8 +66,8 @@ function FILTER_FLUSH_FILTERS () {
 	} // END - if
 
 	// Nothing is added/remove by default
-	$inserted = 0;
-	$removed = 0;
+	$inserted = '0';
+	$removed = '0';
 
 	// Prepare SQL queries
 	$insertSQL = "INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
@@ -283,10 +283,10 @@ function FILTER_UPDATE_LOGIN_DATA () {
 	if (!isMember()) return false;
 
 	// Secure user id
-	setUserId(getSession('userid'));
+	setMemberId(getSession('userid'));
 
 	// Found a userid?
-	if (fetchUserData(getUserId())) {
+	if (fetchUserData(getMemberId())) {
 		// Load last module and online time
 		$content = getUserDataArray();
 
@@ -307,15 +307,10 @@ function FILTER_UPDATE_LOGIN_DATA () {
 		} // END - if
 
 		// Update last module / online time
-		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1",
-			array(
-				getWhat(),
-				detectRemoteAddr(),
-				getUserId()
-			), __FUNCTION__, __LINE__);
+		updateLastActivity(getMemberId());
 	}  else {
 		// Destroy session, we cannot update!
-		destroyUserSession();
+		destroyMemberSession();
 	}
 }
 
@@ -348,7 +343,7 @@ function FILTER_REMOVE_UPDATES ($data) {
 	// Do we need to remove update depency?
 	if (countExtensionUpdateDependencies() > 0) {
 		// Then find all updates we shall no longer execute
-		foreach (getExtensionUpdateDependencies() as $id=>$ext_name) {
+		foreach (getExtensionUpdateDependencies() as $id => $ext_name) {
 			// Shall we remove this update?
 			if (in_array($ext_name, getExtensionRemovalList())) {
 				// Then remove this extension!
@@ -366,7 +361,7 @@ function FILTER_DETERMINE_USERNAME () {
 	// Check if logged in
 	if (isMember()) {
 		// Is still logged in so we welcome him with his name
-		if (fetchUserData(getUserId())) {
+		if (fetchUserData(getMemberId())) {
 			// Load surname and family's name and build the username
 			$content = getUserDataArray();
 
@@ -383,10 +378,7 @@ function FILTER_DETERMINE_USERNAME () {
 			setUsername('<em>{--USERNAME_UNKNOWN--}</em>');
 
 			// Destroy session
-			destroyUserSession();
-
-			// Kill userid
-			setUserId(0);
+			destroyMemberSession();
 		}
 	} elseif (isAdmin()) {
 		// Admin is there
@@ -398,40 +390,57 @@ function FILTER_DETERMINE_USERNAME () {
 }
 
 // Filter for compiling config entries
-function FILTER_COMPILE_CONFIG ($code) {
-	// Compile {?some_var?} to getConfig('some_var')
-	preg_match_all('/\{\?(([a-zA-Z0-9-_]+)*)\?\}/', $code, $matches);
+function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
+	// Save the uncompiled code
+	$uncompiled = $code;
+
+	// Do we have cache?
+	if (!isset($GLOBALS['compiled_config'][$code])) {
+		// Compile {?some_var?} to getConfig('some_var')
+		preg_match_all('/\{\?(([a-zA-Z0-9-_]+)*)\?\}/', $code, $matches);
+
+		// Some entries found?
+		if ((count($matches) > 0) && (count($matches[0]) > 0)) {
+			// Replace all matches
+			foreach ($matches[0] as $key => $match) {
+				// Do we have cache?
+				if (!isset($GLOBALS['compile_config'][$matches[1][$key]])) {
+					// Is the config valid?
+					if (isConfigEntrySet($matches[1][$key])) {
+						// Set it for caching
+						$GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . $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]) . "').\"";
+					} 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]) . "').\"";
+					} else {
+						// Unhandled!
+						$GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
+					}
+				} // END - if
 
-	// Some entries found?
-	if ((count($matches) > 0) && (count($matches[0]) > 0)) {
-		// Replace all matches
-		foreach ($matches[0] as $key => $match) {
-			// Do we have cache?
-			if (!isset($GLOBALS['compile_config'][$matches[1][$key]])) {
-				// Is the config valid?
-				if (isConfigEntrySet($matches[1][$key])) {
-					// Set it for caching
-					$GLOBALS['compile_config'][$matches[1][$key]] = getConfig($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]));
-				} 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]));
-				} else {
-					// Unhandled!
-					$GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
-				}
-			} // END - if
+				// 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>');
+			} // END - foreach
+		} // END - if
 
-			// Use this for replacing
-			$code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
-			//* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.htmlentities($code).'</pre>');
-		} // END - foreach
+		// Add it to cache
+		$GLOBALS['compiled_config'][$uncompiled] = $code;
+	} // END - if
+
+	// 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($eval);
 	} // END - if
 
 	// Return compiled code
-	return $code;
+	return $GLOBALS['compiled_config'][$uncompiled];
 }
 
 // Filter for compiling extension data
@@ -445,24 +454,28 @@ function FILTER_COMPILE_EXTENSION ($code) {
 	if ((count($matches) > 0) && (count($matches[3]) > 0)) {
 		// Replace all matches
 		foreach ($matches[3] as $key => $cmd) {
-			// By default we have no extension installed, so 'false' is assumed
-			$replacer = 'false';
+			// Init replacer variable
+			$replacer = '';
 
-			// Is the extension installed?
-			if (isExtensionActive($matches[4][$key])) {
+			// Is the extension installed or code provided?
+			if ($cmd == 'code') {
+				// Code asked for
+				$replacer = "\".getCode(\"" . $matches[4][$key] . "\").\"";
+			} else {
 				// Construct call-back function name
 				$functionName = 'getExtension' . ucfirst(strtolower($cmd));
 
-				// Call the function
-				$replacer = call_user_func_array($functionName, $matches[4][$key]);
-			} // END - if
+				// Construct call of the function
+				$replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
+			}
 
 			// Replace it and insert parameter for GET request
-			$code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=%s", $cmd, $replacer, getConfig('CURR_SVN_REVISION')), $code);
+			$code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code);
 		} // END - foreach
 	} // END - if
 
 	// Return compiled code
+	//* DEBUG: */ die('<pre>'.secureString($code).'</pre>');
 	return $code;
 }
 
@@ -483,7 +496,7 @@ 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'))) && (getOutputMode() == '0')) {
 		// Then abort here
 		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! Please report this bug. Thanks');
 	} // END - if
@@ -580,9 +593,12 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 			if (isGetRequestElementSet('module')) {
 				// Set module from request
 				setModule(getRequestElement('module'));
-			} else {
+			} elseif (getOutputMode() == '0') {
 				// Set default module 'index'
 				setModule('index');
+			} else {
+				// Unknown module
+				setModule('unknown');
 			}
 		} // END - if
 
@@ -621,7 +637,7 @@ function FILTER_TRIGGER_SENDING_POOL () {
 	} // END - if
 
 	// Init counter
-	$GLOBALS['pool_cnt'] = 0;
+	$GLOBALS['pool_cnt'] = '0';
 
 	// Init & set the include pool
 	initIncludePool('pool');
@@ -705,7 +721,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
 	// Is the extension sql_patches installed and at least 0.3.6?
 	if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
 		// Generate random number
-		setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
+		setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
 	} else {
 		// Generate weak (!!!) code
 		setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -725,7 +741,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 ((getTotalFatalErrors() == '0') || (getOutputMode() != 0)) {
 		// Abort executing here
 		return false;
 	} // END - if
@@ -826,7 +842,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') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
 		// Then display it here
 		displayParsingTime();
 	} // END - if
@@ -834,10 +850,13 @@ 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()) return;
+
 	// Do we have cached eval() data?
 	if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) {
 		// Now flush all
-		foreach ($GLOBALS['template_eval'] as $template=>$eval) {
+		foreach ($GLOBALS['template_eval'] as $template => $eval) {
 			// Flush the cache (if not yet found)
 			flushTemplateCache($template, $eval);
 		} // END - if