From b31bb1f27f066a2d49f5ab9ee0ca15e985efc788 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 26 Sep 2011 06:50:23 -0400 Subject: [PATCH] Fixed: FS#1619 - Add apache SNI / SAN support for SSL. --- server/plugins-available/mail_plugin.inc.php | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php index 85515f2..6781fb6 100644 --- a/server/plugins-available/mail_plugin.inc.php +++ b/server/plugins-available/mail_plugin.inc.php @@ -169,8 +169,10 @@ $tmp = file($conf['rootpath'].'/conf/mail/welcome_email_en.txt'); } - $welcome_mail_subject = trim(substr($tmp[0],8)); + $welcome_mail_from = trim(substr($tmp[0],5)); + $welcome_mail_subject = trim(substr($tmp[1],8)); unset($tmp[0]); + unset($tmp[1]); $welcome_mail_message = trim(implode($tmp)); unset($tmp); @@ -180,10 +182,11 @@ $mailHeaders = "MIME-Version: 1.0" . "\n"; $mailHeaders .= "Content-type: text/plain; charset=utf-8" . "\n"; $mailHeaders .= "Content-Transfer-Encoding: 8bit" . "\n"; - $mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n"; - $mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\n"; + $mailHeaders .= "From: $welcome_mail_from" . "\n"; + $mailHeaders .= "Reply-To: $welcome_mail_from" . "\n"; $mailTarget = $data["new"]["email"]; - $mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?="; + // $mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?="; + $mailSubject = "=?utf-8?B?".base64_encode($welcome_mail_subject)."?="; mail($mailTarget, $mailSubject, $welcome_mail_message, $mailHeaders); -- Gitblit v1.9.1