From 22752170fbbe19fe888612f1c94ec3689bab95bd Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Fri, 3 Oct 2008 03:57:58 +0000 Subject: [PATCH] BUGFIX: Fixed bounce-address generation so that it doesn't have a human component to the email address git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63602 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- email/Mailer.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/email/Mailer.php b/email/Mailer.php index 32e99ac6e..2b635f3ce 100644 --- a/email/Mailer.php +++ b/email/Mailer.php @@ -124,14 +124,14 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $ $headers["From"] = validEmailAddr($from); // Messages with the X-SilverStripeMessageID header can be tracked - if(isset($customheaders["X-SilverStripeMessageID"]) && defined('BOUNCE_EMAIL')) { - $bounceAddress = BOUNCE_EMAIL; - // Get the human name from the from address, if there is one - if(ereg('^([^<>]+)<([^<>])> *$', $from, $parts)) - $bounceAddress = "$parts[1]<$bounceAddress>"; - } else { - $bounceAddress = $from; - } + if(isset($customheaders["X-SilverStripeMessageID"]) && defined('BOUNCE_EMAIL')) { + $bounceAddress = BOUNCE_EMAIL; + } else { + $bounceAddress = $from; + } + + // Strip the human name from the bounce address + if(ereg('^([^<>]*)<([^<>]+)> *$', $bounceAddress, $parts)) $bounceAddress = $parts[2]; // $headers["Sender"] = $from; $headers["X-Mailer"] = X_MAILER;