From 91341bcfc6d9e2f06b3abf3f73e05c2c60fbd30e Mon Sep 17 00:00:00 2001 From: "bbaetz%student.usyd.edu.au" <> Date: Sun, 7 Apr 2002 11:13:31 +0000 Subject: Bug 133423 - Audit templates for FILTER usage r=gerv, justdave --- template/default/admin/account_created.tmpl | 2 +- template/default/admin/account_exists.tmpl | 4 ++-- template/default/admin/change-password.html.tmpl | 2 +- template/default/admin/create_account.tmpl | 2 +- template/default/attachment/created.atml | 2 +- template/default/attachment/edit.atml | 6 +++--- template/default/attachment/list.atml | 4 ++-- template/default/attachment/viewall.atml | 5 +++-- template/default/attachstatus/create.atml | 2 +- template/default/attachstatus/delete.atml | 3 +++ template/default/attachstatus/edit.atml | 6 +++--- template/default/attachstatus/list.atml | 2 +- template/default/buglist/buglist.html.tmpl | 2 +- template/default/buglist/change-form.tmpl | 6 +++--- template/default/global/header | 2 +- template/default/index.tmpl | 2 +- template/default/info/describe-components.tmpl | 7 ++++--- template/default/info/quips.tmpl | 2 +- template/default/prefs/account.tmpl | 2 +- template/default/prefs/userprefs.tmpl | 5 +++-- template/default/show/comments.tmpl | 2 +- template/default/show/multiple.tmpl | 8 ++++---- template/default/show/show_bug.html.tmpl | 3 ++- template/default/token/confirmemail.html.tmpl | 2 +- template/default/token/emailchangenew.txt.tmpl | 4 ++-- template/default/token/emailchangeold.txt.tmpl | 2 +- 26 files changed, 48 insertions(+), 41 deletions(-) (limited to 'template/default') diff --git a/template/default/admin/account_created.tmpl b/template/default/admin/account_created.tmpl index ad4310ec4..46bc82ad2 100644 --- a/template/default/admin/account_created.tmpl +++ b/template/default/admin/account_created.tmpl @@ -25,7 +25,7 @@

A new account, - [% login %], + [% login FILTER html %], has been created and a randomly-generated password has been e-mailed to that address.

diff --git a/template/default/admin/account_exists.tmpl b/template/default/admin/account_exists.tmpl index 23b9e0338..a4357a5a0 100644 --- a/template/default/admin/account_exists.tmpl +++ b/template/default/admin/account_exists.tmpl @@ -25,8 +25,8 @@
- - A Bugzilla account for [% login %] already exists. If you + + A Bugzilla account for [% login FILTER html %] already exists. If you are the account holder and have forgotten your password, .
diff --git a/template/default/admin/change-password.html.tmpl b/template/default/admin/change-password.html.tmpl index 29d03c030..a8ad930ee 100644 --- a/template/default/admin/change-password.html.tmpl +++ b/template/default/admin/change-password.html.tmpl @@ -26,7 +26,7 @@

- + diff --git a/template/default/admin/create_account.tmpl b/template/default/admin/create_account.tmpl index 61ad95b8a..ab35ce53d 100644 --- a/template/default/admin/create_account.tmpl +++ b/template/default/admin/create_account.tmpl @@ -38,7 +38,7 @@ diff --git a/template/default/attachment/created.atml b/template/default/attachment/created.atml index ab5e5ef9c..c46afe06b 100644 --- a/template/default/attachment/created.atml +++ b/template/default/attachment/created.atml @@ -28,7 +28,7 @@ @@ -55,7 +55,7 @@ none [% ELSE %] [% FOREACH s = attachment.statuses %] - [% s %]
+ [% s FILTER html %]
[% END %] [% END %] diff --git a/template/default/attachment/viewall.atml b/template/default/attachment/viewall.atml index 0500a09d4..c3cca2ff3 100755 --- a/template/default/attachment/viewall.atml +++ b/template/default/attachment/viewall.atml @@ -19,10 +19,11 @@ # Contributor(s): Myk Melez #%] +[% filtered_summary = bugsummary FILTER html %] [% INCLUDE global/header title = "View All Attachments for Bug #$bugid" h1 = "View All Attachments for Bug #$bugid" - h2 = bugsummary + h2 = filtered_summary style = " th { text-align: right; vertical-align: top; } td { text-align: left; vertical-align: top; } @@ -67,7 +68,7 @@ none [% ELSE %] [% FOREACH s = a.statuses %] - [% s %]
+ [% s FILTER html %]
[% END %] [% END %] diff --git a/template/default/attachstatus/create.atml b/template/default/attachstatus/create.atml index 128d811dc..7354b3852 100755 --- a/template/default/attachstatus/create.atml +++ b/template/default/attachstatus/create.atml @@ -58,7 +58,7 @@
diff --git a/template/default/attachstatus/delete.atml b/template/default/attachstatus/delete.atml index 19648c6d0..dc50052b9 100644 --- a/template/default/attachstatus/delete.atml +++ b/template/default/attachstatus/delete.atml @@ -20,6 +20,9 @@ # Jeff Hedlund #%] +[%# Filter off the name here to be used multiple times below %] +[% name = name FILTER html %] + [% INCLUDE global/header title = "Confirm Delete of Attachment Status '$name'" %] diff --git a/template/default/attachstatus/edit.atml b/template/default/attachstatus/edit.atml index 366f8eb70..1186d7637 100755 --- a/template/default/attachstatus/edit.atml +++ b/template/default/attachstatus/edit.atml @@ -35,14 +35,14 @@ @@ -56,7 +56,7 @@ diff --git a/template/default/attachstatus/list.atml b/template/default/attachstatus/list.atml index f2d0a4f51..551ab182a 100755 --- a/template/default/attachstatus/list.atml +++ b/template/default/attachstatus/list.atml @@ -43,7 +43,7 @@ - + [% IF Param("useqacontact") %] - + diff --git a/template/default/prefs/userprefs.tmpl b/template/default/prefs/userprefs.tmpl index 8992794b1..5d9fc6eb3 100644 --- a/template/default/prefs/userprefs.tmpl +++ b/template/default/prefs/userprefs.tmpl @@ -34,10 +34,11 @@ # displaying anything, and can contain an optional custom # message if required (which Perl still evaluates as True). #%] - + +[% filtered_login = login FILTER html %] [% INCLUDE global/header title = "User Preferences" - h2 = login + h2 = filtered_login style = "td.selected_tab { border-width: 2px 2px 0px; border-style: solid; diff --git a/template/default/show/comments.tmpl b/template/default/show/comments.tmpl index 14828175d..b020caa0f 100644 --- a/template/default/show/comments.tmpl +++ b/template/default/show/comments.tmpl @@ -39,7 +39,7 @@
------- Additional Comment #[% count %] From - [% comment.name %] + [% comment.name FILTER html %] [%+ comment.time %] ------- [% END %] diff --git a/template/default/show/multiple.tmpl b/template/default/show/multiple.tmpl index 2673c5457..8313323aa 100644 --- a/template/default/show/multiple.tmpl +++ b/template/default/show/multiple.tmpl @@ -96,7 +96,7 @@ @@ -109,14 +109,14 @@ [% IF use_keywords %] [% END %] @@ -151,6 +151,6 @@ [% BLOCK cell %] [% END %] diff --git a/template/default/show/show_bug.html.tmpl b/template/default/show/show_bug.html.tmpl index c6f7deb2b..9b77c23a2 100644 --- a/template/default/show/show_bug.html.tmpl +++ b/template/default/show/show_bug.html.tmpl @@ -19,11 +19,12 @@ # Contributor(s): Gervase Markham #%] +[% filtered_desc = bug.short_desc FILTER html %] [% UNLESS header_done %] [% INCLUDE global/header title = "Bug $bug.bug_id - $bug.short_desc" h1 = "Bugzilla Bug $bug.bug_id" - h2 = bug.short_desc + h2 = filtered_desc extra = navigation_links() %] [% END %] diff --git a/template/default/token/confirmemail.html.tmpl b/template/default/token/confirmemail.html.tmpl index e34a93e63..4d4102968 100644 --- a/template/default/token/confirmemail.html.tmpl +++ b/template/default/token/confirmemail.html.tmpl @@ -27,7 +27,7 @@

- +
- [% Param('emailsuffix') %] + [% Param('emailsuffix') FILTER html %]

- Attachment #[% attachid %] + Attachment #[% attachid %] to Bug #[% bugid %] Created

diff --git a/template/default/attachment/edit.atml b/template/default/attachment/edit.atml index 599aff00a..1d06bfb6f 100755 --- a/template/default/attachment/edit.atml +++ b/template/default/attachment/edit.atml @@ -153,10 +153,10 @@
Description:
-
+
MIME Type:
-
+
Flags:
patch @@ -165,7 +165,7 @@ [% IF statusdefs.size %] Status:
[% FOREACH def = statusdefs %] - [% def.name %]
+ [% def.name FILTER html %]
[% END %] [% END %] diff --git a/template/default/attachment/list.atml b/template/default/attachment/list.atml index 72006cf29..12eeb03e7 100755 --- a/template/default/attachment/list.atml +++ b/template/default/attachment/list.atml @@ -43,7 +43,7 @@ [% IF attachment.ispatch %] patch [% ELSE %] - [% attachment.contenttype %] + [% attachment.contenttype FILTER html %] [% END %]
Name: - +
Description: - +
Product: - [% product %] + [% product FILTER html %]
[% statusdef.name FILTER html %] [% statusdef.description FILTER html %] [% statusdef.sortkey %][% statusdef.product %][% statusdef.product FILTER html %] Edit diff --git a/template/default/buglist/buglist.html.tmpl b/template/default/buglist/buglist.html.tmpl index e4afa8e4d..37a202fe5 100644 --- a/template/default/buglist/buglist.html.tmpl +++ b/template/default/buglist/buglist.html.tmpl @@ -43,7 +43,7 @@ [% END %] [% IF quip %] - [% quip %] + [% quip FILTER html %] [% END %] diff --git a/template/default/buglist/change-form.tmpl b/template/default/buglist/change-form.tmpl index 8bec88c3e..60c1a2de7 100644 --- a/template/default/buglist/change-form.tmpl +++ b/template/default/buglist/change-form.tmpl @@ -246,8 +246,8 @@
@@ -279,7 +279,7 @@ Reassign bugs to
diff --git a/template/default/global/header b/template/default/global/header index 5e6a183dd..dfb3cc080 100755 --- a/template/default/global/header +++ b/template/default/global/header @@ -11,7 +11,7 @@ - [% title %] + [% title FILTER html %] [% Param('headerhtml') %] diff --git a/template/default/index.tmpl b/template/default/index.tmpl index 2f3603c68..7b00539e8 100644 --- a/template/default/index.tmpl +++ b/template/default/index.tmpl @@ -56,7 +56,7 @@ function addSidebar() { [% IF username %] My Bugs
Change password or user preferences
- Logout [% username %]
+ Logout [% username FILTER html %]
[% ELSE %] Log in to an existing account
Open a new Bugzilla account
diff --git a/template/default/info/describe-components.tmpl b/template/default/info/describe-components.tmpl index 5ee8bf4a0..c9dacca10 100644 --- a/template/default/info/describe-components.tmpl +++ b/template/default/info/describe-components.tmpl @@ -19,9 +19,10 @@ # Contributor(s): Bradley Baetz #%] +[% filtered_product = product FILTER html %] [% INCLUDE global/header - title = "Components for $product" - h2 = product %] + title = "Components for $product" + h2 = filtered_product %] [% IF Param("useqacontact") %] [% numcols = 3 %] @@ -70,7 +71,7 @@
- [% comp.initialowner %] + [% comp.initialowner FILTER html %] diff --git a/template/default/info/quips.tmpl b/template/default/info/quips.tmpl index 37e9d863f..d05557650 100644 --- a/template/default/info/quips.tmpl +++ b/template/default/info/quips.tmpl @@ -27,7 +27,7 @@ [% IF added_quip %]

- Your quip '[% added_quip %]' has been added. + Your quip '[% added_quip FILTER html %]' has been added.

[% END %] diff --git a/template/default/prefs/account.tmpl b/template/default/prefs/account.tmpl index e436d07a5..2033e86fc 100644 --- a/template/default/prefs/account.tmpl +++ b/template/default/prefs/account.tmpl @@ -69,7 +69,7 @@ [% IF new_login_name %]
Pending email address:[% new_login_name %][% new_login_name FILTER html %]
Change request expires: [% IF Param('usetargetmilestone') %] Target Milestone:  - [% bug.target_milestone %] + [% bug.target_milestone FILTER html %] [% END %]
- Summary: [% bug.short_desc %] + Summary: [% bug.short_desc FILTER html %]
- Keywords:  [% bug.keywords %] + Keywords:  [% bug.keywords FILTER html %]
[% attr.description%]:  - [% bug.${attr.name} %] + [% bug.${attr.name} FILTER html %]
diff --git a/template/default/token/emailchangenew.txt.tmpl b/template/default/token/emailchangenew.txt.tmpl index 9a0a1e8d7..5a5ae2535 100644 --- a/template/default/token/emailchangenew.txt.tmpl +++ b/template/default/token/emailchangenew.txt.tmpl @@ -27,10 +27,10 @@ for the [% oldemailaddress %] account to your address. To confirm the change, visit the following link: -[% Param('urlbase') %]token.cgi?a=cfmem&t=[% token %] +[% Param('urlbase') %]token.cgi?a=cfmem&t=[% token FILTER html %] If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token %] +[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER html %] diff --git a/template/default/token/emailchangeold.txt.tmpl b/template/default/token/emailchangeold.txt.tmpl index 661f8f1d4..82ecf1dfc 100644 --- a/template/default/token/emailchangeold.txt.tmpl +++ b/template/default/token/emailchangeold.txt.tmpl @@ -31,5 +31,5 @@ for your account to [% newemailaddress %]. If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token %] +[% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER html %] -- cgit v1.2.3-24-g4f1b