X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=458dd1792c3a244f790bc723f3aca25b71d662a4;hb=8d4176053d397a86baca20b4d7ab7ed526355be8;hp=c77eb0c92aec2bfca0887f262e79bc34119f92c6;hpb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;p=mailer.git

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index c77eb0c92a..458dd1792c 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -42,10 +42,17 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Private function to replace the code
+function replaceExpressionCode ($data, $replacer) {
+	// Replace the code
+	// @TODO is escapeQuotes() enougth for strings with single/double quotes?
+	return str_replace($data['matches'][0][$data['key']], $replacer, escapeQuotes($data['code']));
+}
+
 // Expression call-back function for getCode() calls
 function doExpressionCode ($data) {
 	// Replace the code
-	$code = str_replace($data['matches'][0][$data['key']], "\" . getCode('" . $data['matches'][4][$data['key']] . "') . \"", $data['code']);
+	$code = str_replace($data['matches'][0][$data['key']], "{DQUOTE} . getCode('" . $data['matches'][4][$data['key']] . "') . {DQUOTE}", $data['code']);
 
 	// Return replaced code
 	return $code;
@@ -57,10 +64,10 @@ function doExpressionUrl ($data) {
 	if ($data['callback'] == 'js') $data['mode'] = 1;
 
 	// Handle an URL here
-	$replacer = "\" . encodeUrl(\"" . $data['matches'][4][$data['key']] . "\", " . $data['mode'] . ") . \"";
+	$replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['mode'] . ') . {DQUOTE}';
 
 	// Replace it
-	$code = str_replace($data['matches'][0][$data['key']], $replacer, $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -71,8 +78,11 @@ function doExpressionServer ($data) {
 	// This will make 'foo_bar' to detectFooBar()
 	$functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $data['callback'] . "')))";
 
+	// Generate replacer
+	$replacer = '{DQUOTE} . call_user_func(' . $functionName . ') . {DQUOTE}';
+
 	// Replace it
-	$code = str_replace($data['matches'][0][$data['key']], "\" . call_user_func(" . $functionName . ") . \"", $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -89,9 +99,9 @@ function doExpressionUser ($data) {
 		if ($data['matches'][4][$data['key']] == '$userid') {
 			// Use dynamic call
 			$functionName = "getFetchedUserData('userid', \$userid, '" . $data['callback'] . "')";
-		} elseif ($data['matches'][4][$data['key']] > 0) {
+		} elseif (!empty($data['matches'][4][$data['key']])) {
 			// User data found
-			$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", " . $data['callback'] . "')";
+			$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
 		}
 	} elseif ((!empty($data['callback'])) && (isUserDataValid())) {
 		// "Call-back" alias column for current logged in user's data
@@ -104,8 +114,11 @@ function doExpressionUser ($data) {
 		$functionName = $data['extra_func'] . '(' . $functionName . ')';
 	} // END - if
 
+	// Generate replacer
+	$replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}';
+
 	// Now replace the code
-	$code = str_replace($data['matches'][0][$data['key']], "\" . " . $functionName . " . \"", $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -122,11 +135,14 @@ function doExpressionExt ($data) {
 		$functionName = 'getExtension' . ucfirst(strtolower($data['callback']));
 
 		// Construct call of the function
-		$replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $data['matches'][4][$data['key']] . "', true)) . \"";
+		$replacer = "{DQUOTE} . call_user_func_array('" . $functionName . "', array('" . $data['matches'][4][$data['key']] . "', true)) . {DQUOTE}";
 	} // END - if
 
+	// Generate replacer
+	$replacer = sprintf("&ext=%s&ver=%s&rev={DQUOTE} . getConfig('CURR_SVN_REVISION') . {DQUOTE}", $data['matches'][4][$data['key']], $replacer);
+
 	// Replace it and insert parameter for GET request
-	$code = str_replace($data['matches'][0][$data['key']], sprintf("&ext=%s&ver=%s&rev=\" . getConfig('CURR_SVN_REVISION') . \"", $data['matches'][4][$data['key']], $replacer), $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -135,14 +151,11 @@ function doExpressionExt ($data) {
 // Expression call-back function for getting configuration data
 // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 function doExpressionConfig ($data) {
-	// Read configuration
-	$configValue = getConfig($data['matches'][4][$data['key']]);
-
-	// Construct a new expression
-	$replacer = '{%pipe,' . $data['callback'] . ',' . $configValue . '%}';
+	// Default replacer is the config value itself
+	$replacer = '{DQUOTE}  . ' . $data['callback'] . '(getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
 
 	// Replace the config entry
-	$code = str_replace($data['matches'][0][$data['key']], $replacer, $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -153,14 +166,20 @@ function doExpressionPipe ($data) {
 	// We need callback and extra_func: callback is really the call-back function, extra_func is our value
 	$replacer = $data['extra_func'];
 
+	// Is the extra_func empty and value set?
+	if ((empty($replacer)) && (isset($data['value']))) {
+		// Then use this
+		$replacer = $data['value'];
+	} // END - if
+
 	// Do we have a call-back? Should always be there!
 	if (!empty($data['callback'])) {
 		// Parse it through this function
-		$replacer = "\" . " . $data['callback'] . "('" . $replacer . "') . \"";
+		$replacer = '{DQUOTE} . ' . $data['callback'] . "('" . $replacer . "') . {DQUOTE}";
 	} // END - if
 
 	// Replace the config entry
-	$code = str_replace($data['matches'][0][$data['key']], $replacer, $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -169,10 +188,10 @@ function doExpressionPipe ($data) {
 // Expression call-back function for calling filters
 function doExpressionFilter ($data) {
 	// Construct replacement
-	$replacer = "\" . runFilterChain('" . $data['matches'][4][$data['key']] . "') . \"";
+	$replacer = "{DQUOTE} . runFilterChain('" . $data['matches'][4][$data['key']] . "') . {DQUOTE}";
 
 	// Run the filter and insert result
-	$code = str_replace($data['matches'][0][$data['key']], $replacer, $data['code']);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return replaced code
 	return $code;
@@ -193,7 +212,7 @@ function doExpressionValidatorLinks ($data) {
 	} // END - if
 
 	// Replace the code
-	$code = str_replace($data['matches'][0][$data['key']], $replacer, $code);
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return the (maybe) replaced code
 	return $code;
@@ -201,18 +220,36 @@ function doExpressionValidatorLinks ($data) {
 
 // Expression call-back for dynamic messages
 function doExpressionMessage ($data) {
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callback=' . $data['callback'] . ',extra_func=' . $data['extra_func'] . ',value=' . $data['value']);
+
 	// Message string replacement depends on if message is masked
-	if (isMessageMasked($data['callback'])) {
+	if ((isMessageMasked($data['callback'])) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
 		// Message should be masked
-		$replacer = "\" . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . \"";
+		$replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
+	} elseif (!empty($data['value'])) {
+		// value is set, so it is masked message
+		$replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['value'] . "') . {DQUOTE}";
 	} else {
 		// Regular message
-		$replacer = "\" . getMessage('" . $data['callback'] . "') . \"";
+		$replacer = "{DQUOTE} . getMessage('" . $data['callback'] . "') . {DQUOTE}";
 	}
 
 	// Replace the code
-	// @TODO is escapeQuotes enougth for strings with single/double quotes?
-	$code = str_replace($data['matches'][0][$data['key']], $replacer, escapeQuotes($data['code']));
+	$code = replaceExpressionCode($data, $replacer);
+
+	// Return the (maybe) replaced code
+	return $code;
+}
+
+// Expression call-back for template functions
+function doExpressionTemplate ($data) {
+	// Do the replacement
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
+	$replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true) . {DQUOTE}";
+
+	// Replace the code
+	$code = replaceExpressionCode($data, $replacer);
 
 	// Return the (maybe) replaced code
 	return $code;