X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=3aa8026953da4a850835eb16ce2523a65b60e0ba;hb=93ccd79d1a3fcb1ee5a101cb6bb670901f154555;hp=a9aa0b5681c3034b9e341a0b355c5259e257b324;hpb=8e4b45208df786e67751a6830afe84635b2ca3c5;p=mailer.git

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index a9aa0b5681..3aa8026953 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -50,8 +50,8 @@ function replaceExpressionCode ($data, $replacer) {
 // Private function to determine wether we have a special expression function avaible
 // (mostly located in wrapper-functions.php)
 function isExpressionFunctionAvaiable ($data) {
-	// Get the enty we need
-	$entry = $data['matches'][4][$data['key']];
+	// Get the enty we need and trim it
+	$entry = trim($data['matches'][4][$data['key']]);
 
 	// Do we have cache?
 	if (!isset($GLOBALS['expression_function_available'][$entry])) {
@@ -70,7 +70,7 @@ function isExpressionFunctionAvaiable ($data) {
 		// Is that function there?
 		if (function_exists($functionName)) {
 			// Cache it all
-			$GLOBALS['expression_function_name'][$entry] = $functionName;
+			$GLOBALS['expression_function_name'][$entry]      = $functionName;
 			$GLOBALS['expression_function_available'][$entry] = true;
 		} else {
 			// Not avaiable
@@ -109,10 +109,12 @@ function doExpressionCode ($data) {
 // Expression call-back function for URLs
 function doExpressionUrl ($data) {
 	// Do we have JS-mode?
-	if ($data['callback'] == 'js') $data['mode'] = 1;
+	if ($data['callback'] == 'js') {
+		$data['output_mode'] = 1;
+	} // END - if
 
 	// Handle an URL here
-	$replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['mode'] . ') . {DQUOTE}';
+	$replacer = "{DQUOTE} . encodeUrl('" . $data['matches'][4][$data['key']] . "', " . $data['output_mode'] . ') . {DQUOTE}';
 
 	// Replace it
 	$code = replaceExpressionCode($data, $replacer);
@@ -192,8 +194,11 @@ function doExpressionPipe ($data) {
 		if ((empty($data['value'])) && ($data['value'] != '0')) {
 			// No value is set
 			$replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '())) . {DQUOTE}';
+		} elseif (isXmlTypeBool($data['value'])) {
+			// Boolean value detected
+			$replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '(' . $data['value'] . '))) . {DQUOTE}';
 		} else {
-			// Some value is set
+			// Some string/integer value is set
 			$replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . "('" . $data['value'] . "'))) . {DQUOTE}";
 		}
 	} // END - if
@@ -315,7 +320,7 @@ function doExpressionMath ($data) {
 // Expression call-back for GET request
 function doExpressionGet ($data) {
 	// Construct the replacer
-	$replacer = '{%pipe,getRequestParameter=' . $data['value'] . '%}';
+	$replacer = '{%pipe,getRequestElement=' . $data['value'] . '%}';
 
 	// Replace the code
 	$code = replaceExpressionCode($data, $replacer);
@@ -327,7 +332,7 @@ function doExpressionGet ($data) {
 // Expression call-back for POST request
 function doExpressionPost ($data) {
 	// Construct the replacer
-	$replacer = '{%pipe,postRequestParameter=' . $data['value'] . '%}';
+	$replacer = '{%pipe,postRequestElement=' . $data['value'] . '%}';
 
 	// Replace the code
 	$code = replaceExpressionCode($data, $replacer);