135817 - templatise Token.pm

Status: RESOLVED FIXED

(Bugzilla :: Administration, task, P3)

Description

[John Vandenberg]

MailPasswordToken in Token.pm generates an email without using a param or
template.    Token.pm uses mail templates in all other instances, so for
consistency we should move this block out into a template.

Comment 1

[Dave Miller [:justdave]]

Token.pm was Myk's baby...

Comment 2

[John Vandenberg]

Attachment: v1: patch to Token.pm

This patch is to make Token.pm consistent for 2.16, hence it follows the
existing style.

Comment 3

[John Vandenberg]

Attachment: newpassword.txt.tmpl

Comment 4

[Gervase Markham [:gerv]]

Comment on attachment 78143 [details] [diff] [review]
v1: patch to Token.pm

>+    $vars->{'token'} = &::url_quote($token);

The quoting should be done using filters in the template. I notice
you also FILTER html; I think something's wrong here.

> You or someone impersonating you has requested to change your Bugzilla
could be
You (or someone impersonating you) has made a request to change your Bugzilla

Gerv

Comment 5

[John Vandenberg]

Bug 136180 is fixing the other templates uri quoting mechanism.

Comment 6

[Gervase Markham [:gerv]]

zeroj - are you on the case with an updated patch here? :-)

Gerv

Comment 7

[John Vandenberg]

I do have a patch available, however I was waiting for FILTER url_quote to land.

Why do you want me to change myk's orignal text?

Comment 8

[Gervase Markham [:gerv]]

> I do have a patch available, however I was waiting for FILTER url_quote to land.

I just landed it :-)

> Why do you want me to change myk's orignal text?

Because my version is clearer, but not worth opening a whole new bug for.

Gerv

Comment 9

[Gervase Markham [:gerv]]

> I just landed it :-)

Er... this would be what's technically known as "rubbish". Ignore that sentence.

Gerv

Comment 10

[John Vandenberg]

Attachment: v2

Comment 11

[John Vandenberg]

Attachment: newpassword.txt.tmpl

Comment 12

[Gervase Markham [:gerv]]

Comment on attachment 79717 [details] [diff] [review]
v2

r=gerv. This applies to both attachments.

Gerv

Comment 13

[Bradley Baetz (:bbaetz)]

Comment on attachment 79717 [details] [diff] [review]
v2

template locations have moved - this should be under email/<something>. Also,
you should use the new ThrowTemplateError function instead of DisplayError &&
exit.

I'll r= this as soon as thats done...

Comment 14

[John Vandenberg]

Attachment: v3: post template re-organisation

This patch depends on attachment 79718 [details] [diff] [review] being placed in the repository as
.../template/en/default/account/email/password.txt.html

Comment 15

[Bradley Baetz (:bbaetz)]

Comment on attachment 81092 [details] [diff] [review]
v3: post template re-organisation

looks good.

r=bbaetz x2 if someone else agrees on teh name - I'm still fuzzy on the new
template naming convention.

Comment 16

[Gervase Markham [:gerv]]

The name chosen for this template was
account/password/forgotten-password.txt.tmpl, to match
account/password/set-forgotten-password.htm.tmpl.

Fixed. Thanks very much!

Checking in Token.pm;
/cvsroot/mozilla/webtools/bugzilla/Token.pm,v  <--  Token.pm
new revision: 1.10; previous revision: 1.9
done
RCS file:
/cvsroot/mozilla/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl,v
done
Checking in template/en/default/account/password/forgotten-password.txt.tmpl;
/cvsroot/mozilla/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl,v
 <--  forgotten-password.txt.tmpl
initial revision: 1.1
done

Gerv