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 e1098bf30180d37f6ba6543a3181e5ad7734e0e3..dd533a27a7cbcbc53ec6874c9eb99b024ae8c3d9 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -188,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['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 {
                        // No value is set
                        $replacer = '{DQUOTE} . ' . $data['extra_func2'] . '(' . $data['extra_func'] . '(' . $data['callback'] . '())) . {DQUOTE}';
                } else {


@@ -263,14 +264,17 @@ function doExpressionMessage ($data) {
 
 // Expression call-back for template functions
 function doExpressionTemplate ($data) {
 
 // Expression call-back for template functions
 function doExpressionTemplate ($data) {

+       // Construct call-back function name
+       $callback = 'doTemplate' . $data['callback'];
+

        // Init replacer
        // Init replacer

-       $replacer = '<!-- ['.__FUNCTION__.':'.__LINE__.'] Call-back function doTemplate' . $data['callback']  . ' does not exist. //-->';
+       $replacer = '<!-- ['.__FUNCTION__.':'.__LINE__.'] Call-back function ' . $callback  . ' does not exist. //-->';

 
        // Is the function there?
 
        // Is the function there?

-       if (function_exists($data['callback'])) {
+       if (function_exists($callback)) {

                // Do the replacement
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
                // Do the replacement
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);

-               $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true";
+               $replacer = '{DQUOTE} . ' . $callback . "('" . $GLOBALS['current_template'] . "', true";

 
                // Is 'value' set?
                if (!empty($data['value'])) {
 
                // Is 'value' set?
                if (!empty($data['value'])) {