Old, lost function sendHtmlMail() removed, this is now handled by sendEmail() and...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index eef935d62ec923e44ad7b5cd93e7afa83fef44e2..57431c93293b4da3e2b502bea058e760efa5f936 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -131,13 +131,22 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 
        // Check for PHPMailer or debug-mode
        if ((!checkPhpMailerUsage()) || (isDebugModeEnabled())) {
+               // Prefix is '' for text mails
+               $prefix = '';
+
+               // Is HTML?
+               if ($isHTML == 'Y') {
+                       // Set prefix
+                       $prefix = 'html_';
+               } // END - if
+
                // Not in PHPMailer-Mode
                if (empty($mailHeader)) {
                        // Load email header template
-                       $mailHeader = loadEmailTemplate('header');
+                       $mailHeader = loadEmailTemplate($prefix . 'header');
                } else {
                        // Append header
-                       $mailHeader .= loadEmailTemplate('header');
+                       $mailHeader .= loadEmailTemplate($prefix . 'header');
                }
        } // END - if
 
@@ -156,9 +165,6 @@ Message : ' . htmlentities(utf8_decode($message)) . '
 
                // This is always fine
                return true;
-       } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
-               // Send mail as HTML away
-               return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
        } elseif (!empty($toEmail)) {
                // Send Mail away
                return sendRawEmail($toEmail, $subject, $message, $mailHeader);
@@ -181,12 +187,12 @@ function checkPhpMailerUsage() {
 // Send out a raw email with PHPMailer class or legacy mail() command
 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) . '"); ';
+       $eval  = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), false)) . '"); ';
+       $eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), false)) . '"); ';
+       $eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($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) . '";';
+       $eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), false)) . '";';
 
        // Run the final eval() command
        eval($eval);
@@ -828,20 +834,23 @@ function sendGetRequest ($script, $data = array()) {
        // Add data
        $body = http_build_query($data, '', '&');
 
-       // Do we have a question-mark in the script?
-       if (strpos($script, '?') === false) {
-               // No, so first char must be question mark
-               $body = '?' . $body;
-       } else {
-               // Ok, add &
-               $body = '&' . $body;
-       }
+       // There should be data, else we don't need to extend $script with $body
+       if (empty($body)) {
+               // Do we have a question-mark in the script?
+               if (strpos($script, '?') === false) {
+                       // No, so first char must be question mark
+                       $body = '?' . $body;
+               } else {
+                       // Ok, add &
+                       $body = '&' . $body;
+               }
 
-       // Add script data
-       $script .= $body;
+               // Add script data
+               $script .= $body;
 
-       // Remove trailed & to make it more conform
-       if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1);
+               // Remove trailed & to make it more conform
+               if (substr($script, -1, 1) == '&') $script = substr($script, 0, -1);
+       } // END - if
 
        // Generate GET request header
        $request  = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
@@ -1402,7 +1411,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
@@ -2393,6 +2402,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
 //-----------------------------------------------------------------------------