First column removed, may now make lesser trouble

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index bccca8bca0c4d10721abab9fc45fae73727d7bdd..00cfe3b84c78f40ea3a1714f1f5209f68bbf7dae 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -106,9 +106,6 @@ function getTotalFatalErrors () {
 function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'toEmail=' . $toEmail . ',subject=' . $subject . ',isHtml=' . $isHtml);
 
-       // Compile subject line (for POINTS constant etc.)
-       eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");');
-
        // Set from header
        if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) {
                // Value detected, is the message extension installed?
@@ -182,12 +179,17 @@ function checkPhpMailerUsage() {
 }
 
 // Send out a raw email with PHPMailer class or legacy mail() command
-function sendRawEmail ($toEmail, $subject, $message, $from) {
-       // Just compile all again, to put out all configs, etc.
-       eval('$toEmail = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($toEmail)), false) . '");');
-       eval('$subject = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($subject)), false) . '");');
-       eval('$message = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($message)), false) . '");');
-       eval('$from    = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($from))   , false) . '");');
+function sendRawEmail ($toEmail, $subject, $message, $headers) {
+       // Just compile all to put out all configs, etc.
+       $eval  = '$toEmail = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($toEmail)), false) . '"); ';
+       $eval .= '$subject = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($subject)), false) . '"); ';
+       $eval .= '$headers = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($headers)), false) . '"); ';
+
+       // Do not decode entities in the message because we also send HTML mails through this function
+       $eval .= '$message = "' . doFinalCompilation(compileRawCode(escapeQuotes($message)), false) . '";';
+
+       // Run the final eval() command
+       eval($eval);
 
        // Shall we use PHPMailer class or legacy mode?
        if (checkPhpMailerUsage()) {
@@ -210,10 +212,10 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
                $mail->Port       = 25;
                $mail->Username   = getConfig('SMTP_USER');
                $mail->Password   = getConfig('SMTP_PASSWORD');
-               if (empty($from)) {
+               if (empty($headers)) {
                        $mail->From = getConfig('WEBMASTER');
                } else {
-                       $mail->From = $from;
+                       $mail->From = $headers;
                }
                $mail->FromName   = getMainTitle();
                $mail->Subject    = $subject;
@@ -225,10 +227,12 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
                } else {
                        $mail->Body       = decodeEntities($message);
                }
+
                $mail->AddAddress($toEmail, '');
                $mail->AddReplyTo(getConfig('WEBMASTER'), getMainTitle());
                $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
                $mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER'));
+               $mail->AddCustomHeader('Bounces-To:' . getConfig('WEBMASTER'));
                $mail->Send();
 
                // Has an error occured?
@@ -244,7 +248,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
                }
        } else {
                // Use legacy mail() command
-               return mail($toEmail, $subject, decodeEntities($message), $from);
+               return mail($toEmail, $subject, decodeEntities($message), $headers);
        }
 }
 
@@ -554,7 +558,7 @@ function redirectToUrl ($URL, $allowSpider = true) {
        } // END - if
 
        // Three different ways to debug...
-       //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+       //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'URL=' . $URL);
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
        //* DEBUG: */ die($URL);
 
@@ -763,7 +767,7 @@ function createFancyTime ($stamp) {
        foreach($data as $k => $v) {
                if ($v > 0) {
                        // Value is greater than 0 "eval" data to return string
-                       eval('$ret .= ", ".$v." {--_' . strtoupper($k) . '--}";');
+                       $ret .= ', ' . $v . ' {--_' . strtoupper($k) . '--}';
                        break;
                } // END - if
        } // END - foreach
@@ -1398,7 +1402,7 @@ function debug_get_printable_backtrace () {
                if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
                if (!isset($trace['line'])) $trace['line'] = __LINE__;
                if (!isset($trace['args'])) $trace['args'] = array();
-               $backtrace .= '<li class="debug_list"><span class="backtrace_file">' . basename($trace['file']) . '</span>:' . $trace['line'].", <span class=\"backtrace_function\">" . $trace['function'] . '(' . count($trace['args']) . ')</span></li>';
+               $backtrace .= '<li class="debug_list"><span class="backtrace_file">' . basename($trace['file']) . '</span>:' . $trace['line'] . ', <span class="backtrace_function">' . $trace['function'] . '(' . count($trace['args']) . ')</span></li>';
        } // END - foreach
 
        // Close it
@@ -2389,6 +2393,31 @@ function makeDatabaseUserId ($userid) {
        return $userid;
 }
 
+// Capitalizes a string with underscores, e.g.: some_foo_string will become SomeFooString
+// Note: This function is cached
+function capitalizeUnderscoreString ($str) {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$str])) {
+               // Init target string
+               $capitalized = '';
+
+               // Explode it with the underscore, but rewrite dashes to underscore before
+               $strArray = explode('_', str_replace('-', '_', $str));
+
+               // "Walk" through all elements and make them lower-case but first upper-case
+               foreach ($strArray as $part) {
+                       // Capitalize the string part
+                       $capitalized .= ucfirst(strtolower($part));
+               } // END - foreach
+
+               // Store the converted string in cache array
+               $GLOBALS[__FUNCTION__][$str] = $capitalized;
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$str];
+}
+
 //-----------------------------------------------------------------------------
 // Automatically re-created functions, all taken from user comments on www.php.net
 //-----------------------------------------------------------------------------