X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=e2ddb66c1d66fc33044cffb3639fcd32267cbeae;hb=23b6a464defc51c7a081d3c83e244a690643752d;hp=8970f8ea32a71dcd71a9f1ce51849a45709502db;hpb=d52beaaad0b8388fec7f9f3cece88ef98a833751;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 8970f8ea32..e2ddb66c1d 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -414,7 +414,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 						$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] . '!';
@@ -435,7 +435,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 	if ($compiled === true) {
 		// Run the code
 		$eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";";
-		//* DEBUG: */ print '<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>';
+		//* DEBUG: */ print('<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>');
 		eval($eval);
 	} // END - if
 
@@ -448,34 +448,54 @@ 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-_,]+)=([^%\}]+))%\}/', $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) {
+		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[4][$key] . "\").\"";
+				$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;
 			} else {
 				// Construct call-back function name
 				$functionName = 'getExtension' . ucfirst(strtolower($cmd));
 
 				// Construct call of the function
-				$replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
+				$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
 			}
 
 			// 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);
+			$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);
+
 	// Return compiled code
-	//* DEBUG: */ die('<pre>'.secureString($code).'</pre>');
+	//* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
 	return $code;
 }
 
@@ -863,5 +883,47 @@ function FILTER_FLUSH_TEMPLATE_CACHE () {
 	} // 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]
 ?>