Closed Bug 135817 Opened 21 years ago Closed 21 years ago

templatise Token.pm

Categories

(Bugzilla :: Administration, task, P3)

2.15

Tracking

()

RESOLVED FIXED
Bugzilla 2.16

People

(Reporter: jayvdb, Assigned: jayvdb)

References

(Blocks 1 open bug)

Details

Attachments

(2 files, 3 obsolete files)

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.
Token.pm was Myk's baby...
Attached patch v1: patch to Token.pm (obsolete) — Splinter Review
This patch is to make Token.pm consistent for 2.16, hence it follows the
existing style.
Attached file newpassword.txt.tmpl (obsolete) —
Priority: -- → P3
Target Milestone: --- → Bugzilla 2.16
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
Attachment #78143 - Flags: review-
Bug 136180 is fixing the other templates uri quoting mechanism.
Depends on: 136180
Keywords: patch, review
zeroj - are you on the case with an updated patch here? :-)

Gerv
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?
> 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

> I just landed it :-)

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

Gerv

Attached patch v2 (obsolete) — Splinter Review
Attachment #78143 - Attachment is obsolete: true
Attachment #78144 - Attachment is obsolete: true
Comment on attachment 79717 [details] [diff] [review]
v2

r=gerv. This applies to both attachments.

Gerv
Attachment #79717 - Flags: review+
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...
Attachment #79717 - Flags: review-
This patch depends on attachment 79718 [details] [diff] [review] being placed in the repository as
.../template/en/default/account/email/password.txt.html
Attachment #79717 - Attachment is obsolete: true
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.
Attachment #81092 - Flags: review+
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
Status: NEW → RESOLVED
Closed: 21 years ago
Resolution: --- → FIXED
Blocks: 134805
Assignee: justdave → jayvdb
QA Contact: matty_is_a_geek → default-qa
You need to log in before you can comment on or make changes to this bug.