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 c8f1bfdf7698c3c1a242cf36605fc14aeb119fa2..4e7c7f264ad73cc89b2786e9051a9b28cd4a53a4 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -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.');
        }
@@ -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
@@ -195,7 +195,7 @@ function doExpressionPipe ($data) {
 
        // 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')) {
@@ -241,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
@@ -257,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'])) {
@@ -296,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'])) {