Code style changed, ext-user continued:

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 92e1757623d255c3cc1b2eee383261c4c22e65d9..4e7c7f264ad73cc89b2786e9051a9b28cd4a53a4 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -53,7 +53,7 @@ function isExpressionFunctionAvaiable ($data) {
        // Get the enty we need and trim it
        $entry = trim($data['matches'][4][$data['key']]);
 
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS['expression_function_available'][$entry])) {
                // Init function name
                $functionName = 'get';
@@ -71,15 +71,15 @@ function isExpressionFunctionAvaiable ($data) {
                if (function_exists($functionName)) {
                        // Cache it all
                        $GLOBALS['expression_function_name'][$entry]      = $functionName;
-                       $GLOBALS['expression_function_available'][$entry] = true;
+                       $GLOBALS['expression_function_available'][$entry] = TRUE;
                } else {
                        // Not avaiable
                        logDebugMessage(__FUNCTION__, __LINE__, 'Expression function ' . $functionName . ' not found. Please consider adding it to improve execution speed.');
 
                        // And cache it
-                       $GLOBALS['expression_function_available'][$entry] = false;
+                       $GLOBALS['expression_function_available'][$entry] = FALSE;
                }
-       } elseif ($GLOBALS['expression_function_available'][$entry] == false) {
+       } elseif ($GLOBALS['expression_function_available'][$entry] == FALSE) {
                // Debug message
                logDebugMessage(__FUNCTION__, __LINE__, 'Expression function for entry ' . $entry . ' requested but does not exist.');
        }
@@ -108,7 +108,7 @@ function doExpressionCode ($data) {
 
 // Expression call-back function for URLs
 function doExpressionUrl ($data) {
-       // Do we have JS-mode?
+       // Is there JS-mode?
        if ($data['callback'] == 'js') {
                // Switch to it
                $data['output_mode'] = '1';
@@ -153,7 +153,7 @@ function doExpressionExt ($data) {
                $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}";
+               $replacer = "{DQUOTE} . call_user_func_array('" . $functionName . "', array('" . $data['matches'][4][$data['key']] . "', TRUE)) . {DQUOTE}";
        } // END - if
 
        // Generate replacer
@@ -169,7 +169,7 @@ function doExpressionExt ($data) {
 // Expression call-back function for getting configuration data
 // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 function doExpressionConfig ($data) {
-       // Do we have a special expression function for it?
+       // Is there a special expression function for it?
        if (isExpressionFunctionAvaiable($data)) {
                // Then use it
                $replacer = '{DQUOTE}  . ' . $data['callback'] . '(' . getExpressionFunction($data) . '()) . {DQUOTE}';
@@ -193,9 +193,9 @@ function doExpressionPipe ($data) {
        // We need callback and extra_func: callback is really the call-back function, extra_func is our value
        $replacer = $data['extra_func'];
 
-       // Do we have a call-back? Should always be there!
+       // Is there a call-back? Should always be there!
        if (!empty($data['callback'])) {
-               //* DEBUG: */ 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
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value[' . gettype($data['value']) . ']=' . $data['value']);
                if ((empty($data['value'])) && ($data['value'] != '0')) {
@@ -211,6 +211,7 @@ function doExpressionPipe ($data) {
        } // END - if
 
        // Replace the config entry
+       //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'replacer=' . $replacer);
        $code = replaceExpressionCode($data, $replacer);
 
        // Return replaced code
@@ -240,7 +241,7 @@ function doExpressionValidatorLinks ($data) {
        // Should we generally include validator links?
        if ((isExtensionInstalled('validator')) && (getConfig('enable_validator') == 'Y') && (!in_array(getModule(), array('admin', 'login')))) {
                // Load the validator template
-               $replacer = escapeQuotes(loadTemplate('validator_links', true));
+               $replacer = escapeQuotes(loadTemplate('validator_links', TRUE));
        } // END - if
 
        // Replace the code
@@ -256,7 +257,7 @@ function doExpressionMessage ($data) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callback=' . $data['callback'] . ',extra_func=' . $data['extra_func'] . ',value=' . $data['value']);
 
        // Message string replacement depends on if message is masked
-       if ((isMessageMasked($data['callback'], false)) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
+       if ((isMessageMasked($data['callback'], FALSE)) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
                // Message should be masked
                $replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
        } elseif (!empty($data['value'])) {
@@ -295,7 +296,7 @@ function doExpressionTemplate ($data) {
        } else {
                // Do the replacement
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']);
-               $replacer = '{DQUOTE} . ' . $callbackFunction . '(' . chr(39) . $GLOBALS['current_template'] . chr(39) . ', true';
+               $replacer = '{DQUOTE} . ' . $callbackFunction . '(' . chr(39) . $GLOBALS['current_template'] . chr(39) . ', TRUE';
 
                // Is 'value' set?
                if (!empty($data['value'])) {
@@ -332,8 +333,18 @@ function doExpressionMath ($data) {
 
 // Expression call-back for GET request
 function doExpressionGet ($data) {
-       // Construct the replacer
-       $replacer = '{%pipe,getRequestElement=' . $data['value'] . '%}';
+       // Construct the replacer:
+       // - GET request element
+       $replacer = '{%pipe,getRequestElement';
+
+       // Add more call-back functions?
+       if (!empty($data['callback'])) {
+               // - Okay, add them
+               $replacer .= ',' . $data['callback'];
+       } // END - if
+
+       // - Finalize replacer
+       $replacer .= '=' . $data['value'] . '%}';
 
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
@@ -344,8 +355,18 @@ function doExpressionGet ($data) {
 
 // Expression call-back for POST request
 function doExpressionPost ($data) {
-       // Construct the replacer
-       $replacer = '{%pipe,postRequestElement=' . $data['value'] . '%}';
+       // Construct the replacer:
+       // - POST request element
+       $replacer = '{%pipe,postRequestElement';
+
+       // Add more call-back functions?
+       if (!empty($data['callback'])) {
+               // - Okay, add them
+               $replacer .= ',' . $data['callback'];
+       } // END - if
+
+       // - Finalize replacer
+       $replacer .= '=' . $data['value'] . '%}';
 
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
@@ -356,8 +377,18 @@ function doExpressionPost ($data) {
 
 // Expression call-back for session data
 function doExpressionSession ($data) {
-       // Construct the replacer
-       $replacer = '{%pipe,getSession=' . $data['value'] . '%}';
+       // Construct the replacer:
+       // - Session element
+       $replacer = '{%pipe,getSession';
+
+       // Add more call-back functions?
+       if (!empty($data['callback'])) {
+               // - Okay, add them
+               $replacer .= ',' . $data['callback'];
+       } // END - if
+
+       // - Finalize replacer
+       $replacer .= '=' . $data['value'] . '%}';
 
        // Debug message
        //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $data['value'] . ',replacer=' . $replacer);