summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-05-03 15:37:42 +0200
committergerv%gerv.net <>2002-05-03 15:37:42 +0200
commitaf7e8c59d7024eacba4c2740e1f1367ef069cbc4 (patch)
tree5db2ab2bd826ae8808936c63b9bb515d3af74692 /template
parent975393052e91c1c22b301c708c156f3784601358 (diff)
downloadbugzilla-af7e8c59d7024eacba4c2740e1f1367ef069cbc4.tar.gz
bugzilla-af7e8c59d7024eacba4c2740e1f1367ef069cbc4.tar.xz
Bug 135836 - change requests should include expiration details. Patch by zeroJ@null.net; r=gerv, justdave.
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/email/change-new.txt.tmpl3
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl4
-rw-r--r--template/en/default/account/password/forgotten-password.txt.tmpl4
3 files changed, 11 insertions, 0 deletions
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 4739c50e7..b07be609c 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -18,6 +18,7 @@
#
# Contributor(s): John Vandenberg <zeroj@null.net>
#%]
+[% expiration_ts = token_ts + (max_token_age * 86400) %]
From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: Bugzilla Change Email Address Request
@@ -34,3 +35,5 @@ this request, visit the following link:
[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %]
+If you do nothing, the request will lapse after
+[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index ac42cccb0..d50a958c6 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -18,6 +18,7 @@
#
# Contributor(s): John Vandenberg <zeroj@null.net>
#%]
+[% expiration_ts = token_ts + (max_token_age * 86400) %]
From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: Bugzilla Change Email Address Request
@@ -33,3 +34,6 @@ this request, visit the following link:
[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %]
+If you do nothing, and [% newemailaddress %] confirms this request, the
+change will be made permanent after
+[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index 155b83b08..bf3242c08 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -18,6 +18,7 @@
#
# Contributor(s): John Vandenberg <zeroj@null.net>
#%]
+[% expiration_ts = token_ts + (max_token_age * 86400) %]
From: bugzilla-admin-daemon
To: [% emailaddress %]
Subject: Bugzilla Change Password Request
@@ -32,3 +33,6 @@ this request, visit the following link:
[%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% token FILTER url_quote %]
+If you do nothing, the request will lapse after
+[%- max_token_age %] days
+([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you log in successfully.