X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fexpression-functions.php;h=dd533a27a7cbcbc53ec6874c9eb99b024ae8c3d9;hb=c9b17a86f4d62b50b8b1fbe6f9d88e6092430526;hp=47da9de13818aff53d7dc1bfbf76f85613678ac5;hpb=d3871e8ae2b4971563132abce52a7771756600e2;p=mailer.git

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 47da9de138..dd533a27a7 100644
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -65,7 +63,7 @@ function isExpressionFunctionAvaiable ($data) {
 			// Add non-empty parts
 			if (!empty($piece)) {
 				// Add it
-				$functionName .= ucfirst(strtolower($piece));
+				$functionName .= capitalizeUnderscoreString($piece);
 			} // END - if
 		} // END - foreach
 
@@ -146,14 +144,14 @@ function doExpressionExt ($data) {
 	// Is the extension installed?
 	if (isExtensionInstalled($data['matches'][4][$data['key']])) {
 		// Construct call-back function name
-		$functionName = 'getExtension' . ucfirst(strtolower($data['callback']));
+		$functionName = 'getExtension' . capitalizeUnderscoreString($data['callback']);
 
 		// Construct call of the function
 		$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={?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}';
@@ -190,7 +188,8 @@ function doExpressionPipe ($data) {
 	if (!empty($data['callback'])) {
 		//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}';
 		} else {
@@ -265,19 +264,28 @@ 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'] . "'";
+	// 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}';
 	} // END - if
 
-	// Replacer is ready
-	$replacer .= ') . {DQUOTE}';
-
 	// Replace the code
 	$code = replaceExpressionCode($data, $replacer);
 
@@ -301,5 +309,29 @@ function doExpressionMath ($data) {
 	return $code;
 }
 
+// Expression call-back for GET request
+function doExpressionGet ($data) {
+	// Construct the replacer
+	$replacer = '{%pipe,getRequestParameter=' . $data['value'] . '%}';
+
+	// Replace the code
+	$code = replaceExpressionCode($data, $replacer);
+
+	// Return the (maybe) replaced code
+	return $code;
+}
+
+// Expression call-back for POST request
+function doExpressionPost ($data) {
+	// Construct the replacer
+	$replacer = '{%pipe,postRequestParameter=' . $data['value'] . '%}';
+
+	// Replace the code
+	$code = replaceExpressionCode($data, $replacer);
+
+	// Return the (maybe) replaced code
+	return $code;
+}
+
 // [EOF]
 ?>