From 895103456fc429edbdf11c5a962f3a051ff183af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 30 Oct 2009 10:17:32 +0000
Subject: [PATCH] Fixes for email delivery

---
 inc/functions.php              | 4 ++--
 templates/de/emails/header.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index fce1f0ab6e..92f96a7121 100644
--- 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 d97036d5a4..3cb2a6d144 100644
--- 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?}>"
-- 
2.39.5