summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authortravis%sedsystems.ca <>2005-03-16 01:44:06 +0100
committertravis%sedsystems.ca <>2005-03-16 01:44:06 +0100
commit5d6b815d1ce8eece29e22e09781f890375f3c403 (patch)
treebaa11798e9e3fd48fc37db3f8b99ffa0e56cd997 /template/en/default
parenta54f3f23447038f15de353b3a8642701325b00ec (diff)
downloadbugzilla-5d6b815d1ce8eece29e22e09781f890375f3c403.tar.gz
bugzilla-5d6b815d1ce8eece29e22e09781f890375f3c403.tar.xz
Bug 135812 : Add a 'mailfrom' parameter to unify bugmail originating address
Patch by Cedric Caron <cedric.caron@urbanet.ch> r=wurblzap a=justdave
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl3
-rw-r--r--template/en/default/account/email/change-new.txt.tmpl3
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl3
-rw-r--r--template/en/default/account/password/forgotten-password.txt.tmpl3
-rw-r--r--template/en/default/request/email.txt.tmpl3
-rw-r--r--template/en/default/whine/multipart-mime.txt.tmpl1
6 files changed, 11 insertions, 5 deletions
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index de2278419..38ad37bef 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -22,9 +22,10 @@
[% PROCESS global/variables.none.tmpl %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
To: [% emailaddress %]
Subject: [% PROCESS subject %]
+X-B[%#%]ugzilla-Type: admin
A request was cancelled from [% remoteaddress %].
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 7113504d8..cbc0af1e7 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -22,9 +22,10 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request
+X-B[%#%]ugzilla-Type: admin
[%+ terms.Bugzilla %] has received a request to change the email address
for the account [% oldemailaddress %] to your address.
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index 272f6d4e5..12de7530d 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -27,12 +27,13 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Email Address Request
Importance: High
X-MSMail-Priority: High
X-Priority: 1
+X-B[%#%]ugzilla-Type: admin
[%+ terms.Bugzilla %] has received a request to change the email address
for your account to [%+ newemailaddress %].
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index 5ac3ed75c..b56e930fd 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -22,9 +22,10 @@
[% PROCESS global/variables.none.tmpl %]
[% expiration_ts = token_ts + (max_token_age * 86400) %]
-From: bugzilla-admin-daemon
+From: [% Param('mailfrom') %]
To: [% emailaddress %]
Subject: [% terms.Bugzilla %] Change Password Request
+X-B[%#%]ugzilla-Type: admin
You have (or someone impersonating you has) requested to change your
[%+ terms.Bugzilla %] password. To complete the change, visit the following link:
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 719f9d869..f34227a56 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -36,10 +36,11 @@
[% to_identity = flag.setter.identity _ "'s request" %]
[% subject_status = statuses.${flag.status} %]
[% END %]
-From: bugzilla-request-daemon
+From: [% Param('mailfrom') %]
To: [% to_email %]
CC: [% flag.type.cc_list %]
Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %]
+X-B[%#%]ugzilla-Type: request
[%- IF flag.target.attachment.exists %] :
[Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]
diff --git a/template/en/default/whine/multipart-mime.txt.tmpl b/template/en/default/whine/multipart-mime.txt.tmpl
index 5e597d899..855cbd066 100644
--- a/template/en/default/whine/multipart-mime.txt.tmpl
+++ b/template/en/default/whine/multipart-mime.txt.tmpl
@@ -34,6 +34,7 @@
From: [% from %]
To: [% recipient.email %]
Subject: [[% terms.Bugzilla %]] [% subject %]
+X-B[%#%]ugzilla-Type: whine
MIME-Version: 1.0
Content-Type: multipart/alternative; boundary="[% boundary %]"