From 0f4f20237119d168bddb26587922b38021995099 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 30 Dec 2010 22:40:10 +0000 Subject: [PATCH] create-mailbox.php: - let smtp_mail() construct the mail headers git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@926 a1433add-5e2c-0410-b055-b7f2511e0802 --- create-mailbox.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/create-mailbox.php b/create-mailbox.php index 1d78f572..20618df6 100644 --- a/create-mailbox.php +++ b/create-mailbox.php @@ -233,17 +233,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $fTo = $fUsername; $fFrom = $SESSID_USERNAME; - $fHeaders = "To: " . $fTo . "\n"; - $fHeaders .= "From: " . $fFrom . "\n"; + $fSubject = $CONF['pSendmail_subject_text']; + $fBody = $CONF['welcome_text']; - $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n"; - $fHeaders .= "MIME-Version: 1.0\n"; - $fHeaders .= "Content-Type: text/plain; charset=utf-8\n"; - $fHeaders .= "Content-Transfer-Encoding: 8bit\n"; - - $fHeaders .= $CONF['welcome_text']; - - if (!smtp_mail ($fTo, $fFrom, $fHeaders)) + if (!smtp_mail ($fTo, $fFrom, $fSubject, $fBody)) { $tMessage .= "
" . $PALANG['pSendmail_result_error'] . "
"; }