From 6d49fc6acc8b2a137ed978b9cc30ceb723a6b631 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 07 Sep 2011 06:06:21 -0400 Subject: [PATCH] Fixes in welcome email. --- server/conf/mail/welcome_email_en.txt | 1 + server/plugins-available/mail_plugin.inc.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/conf/mail/welcome_email_en.txt b/server/conf/mail/welcome_email_en.txt index 3ba16dd..9689485 100644 --- a/server/conf/mail/welcome_email_en.txt +++ b/server/conf/mail/welcome_email_en.txt @@ -1,3 +1,4 @@ +From: ISPConfig <postmaster@localhost.localdomain> Subject: Welcome to your new email account. Welcome to your new email account. Your webmaster. \ No newline at end of file diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php index 85515f2..f09a852 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,8 +182,8 @@ $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) . "?="; -- Gitblit v1.9.1