Fixes for email delivery

diff --git a/inc/functions.php b/inc/functions.php
index fce1f0ab6e0e727d34263d390a064b763d24f575..92f96a7121b47e1622b31cfb96d4485e15056385 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -600,7 +600,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
                        // Free result
                        SQL_FREERESULT($result_email);
                }
-       } elseif ($toEmail == 0) {
+       } elseif ($toEmail == '0') {
                // Is the webmaster!
                $toEmail = getConfig('WEBMASTER');
        }
@@ -637,7 +637,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        if (isDebugModeEnabled()) {
                // In debug mode we want to display the mail instead of sending it away so we can debug this part
                outputHtml('<pre>
-Headers : ' . htmlentities(trim($mailHeader)) . '
+Headers : ' . str_replace('<', '&lt', str_replace('>', '&gt;', htmlentities(trim($mailHeader)))) . '
 To      : ' . $toEmail . '
 Subject : ' . $subject . '
 Message : ' . $message . '

diff --git a/templates/de/emails/header.tpl b/templates/de/emails/header.tpl
index d97036d5a4915e55dcc5fc54a316406b1a96b7f6..3cb2a6d14405e7a1d79714f3407ead634b011a06 100644 (file)
--- a/templates/de/emails/header.tpl
+++ b/templates/de/emails/header.tpl
@@ -1,4 +1,4 @@
 X-Mailer: {?TITLE?} {?FULL_VERSION?}
 Errors-To: {?WEBMASTER?}
 X-Loop: {?WEBMASTER?}
-From: {?MAIN_TITLE?} <{?WEBMASTER?}>
+From: "{?MAIN_TITLE?} <{?WEBMASTER?}>"