X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=12402a4ced7b2c9a46cfcac455e61a8305de65d0;hb=846ac0998b0735e3c538de5b3c22e4e199cb2cb2;hp=b1a31c4a0f57a6e476ec6d4826684b93131e5006;hpb=41792f2d1a2478a284c663c02b2f64ca74b2e3df;p=mailer.git

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index b1a31c4a0f..12402a4ced 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -126,7 +124,7 @@ function doExpressionUrl ($data) {
 // Expression call-back function for reading data from $_SERVER
 function doExpressionServer ($data) {
 	// This will make 'foo_bar' to detectFooBar()
-	$functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $data['callback'] . "')))";
+	$functionName = "'detect' . implode('', array_map('firstCharUpperCase', explode('_', '" . $data['callback'] . "')))";
 
 	// Generate replacer
 	$replacer = '{DQUOTE} . call_user_func(' . $functionName . ') . {DQUOTE}';
@@ -153,7 +151,7 @@ function doExpressionExt ($data) {
 	} // END - if
 
 	// Generate replacer
-	$replacer = sprintf("&ext=%s&ver=%s&rev={?CURR_SVN_REVISION?}", $data['matches'][4][$data['key']], $replacer);
+	$replacer = sprintf("&ext=%s&ver=%s&rev={?CURRENT_REPOSITORY_REVISION?}", $data['matches'][4][$data['key']], $replacer);
 
 	// Replace it and insert parameter for GET request
 	$code = replaceExpressionCode($data, $replacer);
@@ -168,7 +166,7 @@ function doExpressionConfig ($data) {
 	// Do we have a special expression function for it?
 	if (isExpressionFunctionAvaiable($data)) {
 		// Then use it
-		$replacer = '{DQUOTE}  . ' . $data['callback'] . '('.getExpressionFunction($data).'(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
+		$replacer = '{DQUOTE}  . ' . $data['callback'] . '(' . getExpressionFunction($data) . '()) . {DQUOTE}';
 	} else {
 		// Default replacer is the config value itself
 		$replacer = '{DQUOTE}  . ' . $data['callback'] . '(getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
@@ -188,13 +186,17 @@ function doExpressionPipe ($data) {
 
 	// Do we have a call-back? Should always be there!
 	if (!empty($data['callback'])) {
-		//if ($data['callback'] == 'getMemberId') die('<pre>'.encodeEntities(print_r($data, true)).'</pre>');
+		//* DEBUG: */ if ($data['callback'] == 'getMemberId') die('<pre>'.encodeEntities(print_r($data, true)).'</pre>');
 		// If the value is empty, we don't add it
-		if (empty($data['value'])) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value[' . gettype($data['value']) . ']=' . $data['value']);
+		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
@@ -265,18 +267,30 @@ function doExpressionMessage ($data) {
 
 // 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";
-
-	// Is 'value' set?
-	if (!empty($data['value'])) {
-		// Then include it as well
-		$replacer .= ", '" . $data['value'] . "'";
-	} // END - if
-
-	// Replacer is ready
-	$replacer .= ') . {DQUOTE}';
+	// Construct call-back function name
+	$callback = 'doTemplate' . $data['callback'];
+
+	// Init replacer
+	$replacer = '<!-- [' . __FUNCTION__ . ':' . __LINE__.'] Call-back function ' . $callback  . ' does not exist. //-->';
+
+	// Is the function there?
+	if (function_exists($callback)) {
+		// Do the replacement
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
+		$replacer = '{DQUOTE} . ' . $callback . "('" . $GLOBALS['current_template'] . "', true";
+
+		// Is 'value' set?
+		if (!empty($data['value'])) {
+			// Then include it as well
+			$replacer .= ", '" . $data['value'] . "'";
+		} // END - if
+
+		// Replacer is ready
+		$replacer .= ') . {DQUOTE}';
+	} else {
+		// Log missing function
+		logDebugMessage(__FUNCTION__, __LINE__, 'Call-back function ' . $callback . ' does not exist.');
+	}
 
 	// Replace the code
 	$code = replaceExpressionCode($data, $replacer);
@@ -304,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);
@@ -316,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);