diff options
| author | lpsolit%gmail.com <> | 2006-10-21 06:22:54 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2006-10-21 06:22:54 +0200 |
| commit | eedbd699a1aa0f44e7dda37b4d524902a864b783 (patch) | |
| tree | 73665b04bd191ede2b3d6fc98ce1af48675704e3 /template/en/default/account | |
| parent | ac3fe4074a3e583948bf2a1d0b81f8f3f6acce51 (diff) | |
| download | bugzilla-eedbd699a1aa0f44e7dda37b4d524902a864b783.tar.gz bugzilla-eedbd699a1aa0f44e7dda37b4d524902a864b783.tar.xz | |
Bug 135812: Add a 'mailfrom' parameter to unify bugmail originating address - Patch by Cedric Caron <cedric.caron@citycable.ch> r=LpSolit a=myk
Diffstat (limited to 'template/en/default/account')
5 files changed, 10 insertions, 5 deletions
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index f9d310534..4afada50c 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-Bugzilla-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..13162bf34 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-Bugzilla-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..2035390a0 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-Bugzilla-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/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 85fdec157..7a0e10a15 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -23,9 +23,10 @@ [% PROCESS global/variables.none.tmpl %] [% expiration_ts = token_ts + (constants.MAX_TOKEN_AGE * 86400) %] -From: bugzilla-admin-daemon +From: [% Param('mailfrom') %] To: [% email %] Subject: [% terms.Bugzilla %]: confirm account creation +X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to create a user account using your email address ([% email %]). diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index 5ac3ed75c..75720e7c8 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-Bugzilla-Type: admin You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: |