New wrapper functions introduced

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 296f031e7027a767dc33f3234d622f4d03c5f976..f50a594a58a21f8feec74f756c87a495a5cdd49c 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -104,7 +104,7 @@ function getTotalFatalErrors () {
 
 // Send mail out to an email address
 function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}<br />");
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'toEmail=' . $toEmail . ',subject=' . $subject . ',isHtml=' . $isHtml);
 
        // Compile subject line (for POINTS constant etc.)
        eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
@@ -1839,7 +1839,7 @@ function rebuildCache ($cache, $inc = '', $force = false) {
                                loadInclude($inc);
                        } else {
                                // Include not found!
-                               logDebugMessage(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Include ' . $inc . ' not found. cache=' . $cache);
                        }
                } // END - if
        } // END - if
@@ -1909,7 +1909,7 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 // Determines referal id and sets it
 function determineReferalId () {
        // Skip this in non-html-mode and outside ref.php
-       if ((getScriptOutputMode() != 0) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false;
+       if ((!isHtmlOutputMode()) && (basename($_SERVER['PHP_SELF']) != 'ref.php')) return false;
 
        // Check if refid is set
        if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
@@ -2272,7 +2272,7 @@ function getModuleFromFileName ($file, $accessLevel) {
 // Encodes an URL for adding session id, etc.
 function encodeUrl ($url, $outputMode = '0') {
        // Do we have already have a PHPSESSID inside or view.php is called? Then abort here
-       if ((strpos($url, session_name()) !== false) || (getScriptOutputMode() == -3)) return $url;
+       if ((strpos($url, session_name()) !== false) || (isRawOutputMode())) return $url;
 
        // Do we have a valid session?
        if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
@@ -2282,7 +2282,7 @@ function encodeUrl ($url, $outputMode = '0') {
                if (strpos($url, '?') === false) {
                        // No question mark
                        $seperator = '?';
-               } elseif ((getScriptOutputMode() != '0') || ($outputMode != '0')) {
+               } elseif ((!isHtmlOutputMode()) || ($outputMode != '0')) {
                        // Non-HTML mode
                        $seperator = '&';
                }