X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilters.php;h=8cc35e42937455baa353d9e5aabc18c64ab59c02;hb=3deb4216cd947c4eb14b0a9e3b9f637ca25e77d3;hp=90478a949f36383aa99488d420c6249a4b4d63d2;hpb=aaf81b8f35512782d34f78c1a0dac8b42d745393;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 90478a949f..8cc35e4293 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                                      *
@@ -343,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!
@@ -411,10 +411,10 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 						$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]) . "').\"";
+						$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]) . "').\"";
+						$GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \"";
 					} else {
 						// Unhandled!
 						$GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
@@ -434,7 +434,9 @@ 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] . "\";");
+		$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
@@ -446,34 +448,120 @@ 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-_]+)=([a-zA-Z0-9-_]+))*)\%\}/', $code, $matches);
+	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
+	//* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
+
+	// Default is from OUTPUT_HTML
+	$outputMode = getOutputMode();
 
 	// Some entries found?
 	if ((count($matches) > 0) && (count($matches[3]) > 0)) {
 		// Replace all matches
-		foreach ($matches[3] as $key => $cmd) {
-			// Init replacer variable
+		foreach ($matches[2] as $key => $cmd) {
+			// Init replacer/call-back variable
 			$replacer = '';
+			$callback = '';
+			$extraFunction = '';
 
-			// 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));
+			// Extract command and call-back
+			$cmdArray = explode(',', $cmd);
+			$cmd = $cmdArray[0];
+			if (isset($cmdArray[1])) $callback = $cmdArray[1];
+			if (isset($cmdArray[2])) $extraFunction = $cmdArray[2];
 
-				// Construct call of the function
-				$replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
-			}
+			// Is the extension installed or code provided?
+			// @TODO This whole switch-block is very static
+			switch ($cmd) {
+				case 'code': // Code asked for
+					$code = str_replace($matches[0][$key], "\" . getCode('" . $matches[4][$key] . "') . \"", $code);
+					break;
+
+				case 'url':
+					// Do we have JS-mode?
+					if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
+
+					// Handle an URL here
+					$replacer = "\" . encodeUrl(\"" . $matches[4][$key] . "\", " . $outputMode . ") . \"";
+
+					// Replace it
+					$code = str_replace($matches[0][$key], $replacer, $code);
+					break;
+
+				case 'server':
+					// This will make 'foo_bar' to detectFooBar()
+					$functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $callback . "')))";
+
+					// Replace it
+					$code = str_replace($matches[0][$key], "\" . call_user_func(" . $functionName . ") . \"", $code);
+					break;
+
+				case 'user':
+					// Use current userid by default
+					$functionName = 'getMemberId()';
+
+					// User-related data, so is there a userid?
+					if (!empty($matches[4][$key])) {
+						// Do we have a userid or $userid?
+						if ($matches[4][$key] == '$userid') {
+							// Use dynamic call
+							$functionName = "getFetchedUserData('userid', \$userid, '" . $callback . "')";
+						} elseif ($matches[4][$key] > 0) {
+							// User data found
+							$functionName = "getFetchedUserData('userid', " . $matches[4][$key] . ", " . $callback . "')";
+						} // END - if
+					} elseif ((!empty($callback)) && (isMember())) {
+						// "Call-back" alias column for current logged in user's data
+						$functionName = "getUserData('" . $callback . "')";
+					}
 
-			// 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);
+					// Do we have another function to run (e.g. translations)
+					if (!empty($extraFunction)) {
+						// Surround the original function call with it
+						$functionName = $extraFunction . '(' . $functionName . ')';
+					} // END - if
+
+					// Now replace the code
+					$code = str_replace($matches[0][$key], "\" . " . $functionName . " . \"", $code);
+					break;
+
+				case 'ext':
+					// Construct call-back function name
+					$functionName = 'getExtension' . ucfirst(strtolower($callback));
+
+					// 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;ext=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $replacer), $code);
+					break;
+
+				case 'config': // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+					// Read configuration
+					$configValue = getConfig($matches[4][$key]);
+
+					// Do we have a call-back?
+					if (!empty($callback)) {
+						// Parse it through this function
+						$configValue = call_user_func_array($callback, array($configValue));
+					} // END - if
+
+					// Replace the config entry
+					$code = str_replace($matches[0][$key], $configValue, $code);
+					break;
+
+				default:
+					// Unsupported command detected
+					debug_report_bug('Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
+					break;
+			} // END - switch
 		} // END - foreach
 	} // END - if
 
+	// Do we have non-HTML mode?
+	if ((getOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
+
 	// Return compiled code
-	//* DEBUG: */ die('<pre>'.secureString($code).'</pre>');
+	//* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
 	return $code;
 }
 
@@ -591,9 +679,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
 
@@ -845,15 +936,60 @@ 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
 	} // END - if
 }
 
+// Filter for loading user data
+function FILTER_FETCH_USER_DATA ($userid = 0) {
+	// Is the userid not set? Then use member id
+	if (($userid == '0') || (is_null($userid))) $userid = getMemberId();
+
+	// Get user data
+	if (!fetchUserData($userid)) {
+		// Userid is not valid
+		debug_report_bug('User id '.$userid . ' is invalid.');
+	} // END - if
+
+	// Set member id
+	setMemberId($userid);
+}
+
+// Filter for reseting users' last login failure, only available with latest ext-sql_patches
+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.');
+	} // END - if
+
+	// Remmeber login failures if available
+	if (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
+		// Reset login failures
+		SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`login_failures`=0,
+	`last_failure`='0000-00-00 00:00:00'
+WHERE
+	`userid`=%s
+LIMIT 1",
+			array(getMemberId()), __FILE__, __LINE__);
+
+		// Store it in session
+		setSession('mxchange_member_failures' , getUserData('login_failures'));
+		setSession('mxchange_member_last_fail', getUserData('last_failure'));
+	} // END - if
+}
+
 // [EOF]
 ?>