X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fexpression-functions.php;h=1eee08b4c3f4c45598f498397ffde7c6cd00b4a6;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hp=a7dcfcac86e9c47f55223b7d473265c81af93659;hpb=697b58fb2ea96a64370d9f8d23e2f8d414385d79;p=mailer.git

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index a7dcfcac86..1eee08b4c3 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
@@ -318,7 +318,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);
@@ -330,7 +330,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);