Renamed function so it might be more understandable

[mailer.git] / inc / expression-functions.php

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index c8129ddb21dc2072b52edb1ff0b8cff43c2481f0..dd533a27a7cbcbc53ec6874c9eb99b024ae8c3d9 100644 (file)
--- 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                    *
@@ -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);
@@ -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);