From d5f30d8dfda359d6761d164d3c650adf1716213b Mon Sep 17 00:00:00 2001 From: "bbaetz%student.usyd.edu.au" <> Date: Fri, 28 Jun 2002 07:18:02 +0000 Subject: Bug 148488 - more HTML validation fixes r=jouni, gerv --- CGI.pl | 20 ++++++++++---------- buglist.cgi | 8 ++++---- changepassword.cgi | 22 +++++++++++----------- checksetup.pl | 16 ++++++++-------- colchange.cgi | 4 ++-- defparams.pl | 2 +- globals.pl | 2 +- sanitycheck.cgi | 8 ++++---- showdependencygraph.cgi | 4 ++-- .../en/default/account/email/confirm.html.tmpl | 2 +- template/en/default/account/prefs/prefs.html.tmpl | 2 +- .../en/default/admin/attachstatus/delete.html.tmpl | 4 ++-- .../en/default/admin/attachstatus/list.html.tmpl | 7 ++++--- template/en/default/attachment/edit.html.tmpl | 2 +- .../en/default/attachment/show-multiple.html.tmpl | 2 +- template/en/default/bug/dependency-graph.html.tmpl | 6 +++--- .../bug/process/confirm-duplicate.html.tmpl | 2 +- template/en/default/bug/process/midair.html.tmpl | 2 +- template/en/default/bug/show-multiple.html.tmpl | 2 +- template/en/default/global/code-error.html.tmpl | 2 +- template/en/default/global/useful-links.html.tmpl | 16 ++++++++-------- template/en/default/list/edit-multiple.html.tmpl | 2 +- template/en/default/search/form.html.tmpl | 2 -- 23 files changed, 69 insertions(+), 70 deletions(-) diff --git a/CGI.pl b/CGI.pl index ea305db53..b65c74a75 100644 --- a/CGI.pl +++ b/CGI.pl @@ -353,21 +353,21 @@ sub navigation_links($) { my $cur = lsearch(\@bugs, $::FORM{"id"}); if ($cur > 0) { - $retval .= "\n"; - $retval .= "\n"; + $retval .= "\n"; + $retval .= "\n"; } if ($cur < $#bugs) { - $retval .= "\n"; - $retval .= "\n"; + $retval .= "\n"; + $retval .= "\n"; } - $retval .= "\n"; - $retval .= "\n"; + $retval .= "\n"; + $retval .= "\n"; } else { # We are on a bug list - $retval .= "\n"; - $retval .= "\n"; - $retval .= "\n"; + $retval .= "\n"; + $retval .= "\n"; + $retval .= "\n"; } } @@ -972,7 +972,7 @@ sub ThrowTemplateError { send it to $maintainer with details of what you were doing at the time this message appeared.

- diff --git a/buglist.cgi b/buglist.cgi index edbe4c021..c2d44de12 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -832,7 +832,7 @@ sub GenerateSQL { $F{"type$chart-$row-$col"} = shift(@$ref); $F{"value$chart-$row-$col"} = shift(@$ref); if ($debug) { - print qq{

$F{"field$chart-$row-$col"} | $F{"type$chart-$row-$col"} | $F{"value$chart-$row-$col"}*\n}; + print qq{

$F{"field$chart-$row-$col"} | $F{"type$chart-$row-$col"} | $F{"value$chart-$row-$col"}*

\n}; } $col++; @@ -971,7 +971,7 @@ sub GenerateSQL { if ("$f,$t" =~ m/$key/) { my $ref = $funcsbykey{$key}; if ($debug) { - print "

$key ($f , $t ) => "; + print "

$key ($f , $t ) => "; } $ff = $f; if ($f !~ /\./) { @@ -979,7 +979,7 @@ sub GenerateSQL { } &$ref; if ($debug) { - print "$f , $t , $term"; + print "$f , $t , $term

"; } if ($term) { last; @@ -1020,7 +1020,7 @@ sub GenerateSQL { $query = SelectVisible($query, $::userid, $::usergroupset); if ($debug) { - print "

" . value_quote($query) . "

\n"; + print "

" . value_quote($query) . "

\n"; exit; } return $query; diff --git a/changepassword.cgi b/changepassword.cgi index dafe5c1ae..1bc560c17 100755 --- a/changepassword.cgi +++ b/changepassword.cgi @@ -24,16 +24,16 @@ use strict; print q{Content-type: text/html - - - - - + + + + + This URL is obsolete. Forwarding you to the correct one. -

-Going to userprefs.cgi -
- - +

+Going to userprefs.cgi +
+ + } diff --git a/checksetup.pl b/checksetup.pl index 0f9e2328f..738f99386 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -806,14 +806,14 @@ if ($my_index_html) { open HTML, ">index.html"; print HTML <<'END'; - - - - - -

I think you are looking for index.cgi

- - + + + + + +

I think you are looking for index.cgi

+ + END close HTML; } diff --git a/colchange.cgi b/colchange.cgi index 64dd9c4a5..727ad2c90 100755 --- a/colchange.cgi +++ b/colchange.cgi @@ -88,8 +88,8 @@ if (defined $::FORM{'rememberedquery'}) { print "Set-Cookie: SPLITHEADER=$::FORM{'splitheader'} ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n"; print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n"; print "\n"; - print "\n"; - print "What a hack.\n"; + print "\n"; + print "What a hack.\n"; PutHeader ("Change columns"); print "Resubmitting your query with new columns...\n"; exit; diff --git a/defparams.pl b/defparams.pl index 2ba6a31c5..f4fd85f6f 100644 --- a/defparams.pl +++ b/defparams.pl @@ -204,7 +204,7 @@ DefParam("LDAPmailattribute", DefParam("mostfreqthreshold", - "The minimum number of duplicates a bug needs to show up on the most frequently reported bugs page. If you have a large database and this page takes a long time to load, try increasing this number.", + "The minimum number of duplicates a bug needs to show up on the most frequently reported bugs page. If you have a large database and this page takes a long time to load, try increasing this number.", "t", "2"); diff --git a/globals.pl b/globals.pl index f32fc1f3d..6e84cb0da 100644 --- a/globals.pl +++ b/globals.pl @@ -947,7 +947,7 @@ sub DBNameToIdAndCheck { } $name = html_quote($name); - ThrowUserError("The name $name is not a valid username. + ThrowUserError("The name $name is not a valid username. Either you misspelled it, or the person has not registered for a Bugzilla account."); } diff --git a/sanitycheck.cgi b/sanitycheck.cgi index 4172e6b34..706d7dff5 100755 --- a/sanitycheck.cgi +++ b/sanitycheck.cgi @@ -55,17 +55,17 @@ my $offervotecacherebuild = 0; sub Status { my ($str) = (@_); - print "$str

\n"; + print "$str

\n"; } sub Alert { my ($str) = (@_); - Status("$str"); + Status("$str"); } sub BugLink { my ($id) = (@_); - return "$id"; + return "$id"; } sub AlertBadVoteCache { @@ -142,7 +142,7 @@ if (exists $::FORM{'rebuildvotecache'}) { Status("Vote cache has been rebuilt."); } -print "OK, now running sanity checks.

\n"; +print "OK, now running sanity checks.

\n"; # This one goes first, because if this is wrong, then the below tests # will probably fail too diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index 4df71ac49..cf2122540 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -45,10 +45,10 @@ sub CreateImagemap { open MAP, "<$mapfilename"; while(my $line = ) { if($line =~ /^default ([^ ]*)(.*)$/) { - $default = qq{\n}; + $default = qq{\n}; } if ($line =~ /^rectangle \((.*),(.*)\) \((.*),(.*)\) (http[^ ]*)(.*)?$/) { - $map .= qq{\n}; + $map .= qq{bug$6\n}; } } close MAP; diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl index 140c54e0d..0b1ea5334 100644 --- a/template/en/default/account/email/confirm.html.tmpl +++ b/template/en/default/account/email/confirm.html.tmpl @@ -35,7 +35,7 @@ - + diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index 2a232f875..d455b5b66 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -97,7 +97,7 @@

[% current_tab.description %]

- + [% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %] diff --git a/template/en/default/admin/attachstatus/delete.html.tmpl b/template/en/default/admin/attachstatus/delete.html.tmpl index e92b97985..0d5285128 100644 --- a/template/en/default/admin/attachstatus/delete.html.tmpl +++ b/template/en/default/admin/attachstatus/delete.html.tmpl @@ -34,13 +34,13 @@
Old Email Address:
- diff --git a/template/en/default/admin/attachstatus/list.html.tmpl b/template/en/default/admin/attachstatus/list.html.tmpl index 67d5640ae..1640d6e1b 100644 --- a/template/en/default/admin/attachstatus/list.html.tmpl +++ b/template/en/default/admin/attachstatus/list.html.tmpl @@ -55,10 +55,10 @@
+ Do you really want to delete this status?
- + Yes, delete [% statusdef.sortkey %] [% statusdef.product FILTER html %] - + Edit  |  - @@ -76,7 +76,7 @@
- [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 873f73b59..ca72647dd 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -53,7 +53,7 @@ var contentType = '[% contenttype %]'; if ( contentType == 'text/plain' ) { - theContent = theContent.replace( /^

/i , "" );
+          theContent = theContent.replace( /^
/i , "" );
           theContent = theContent.replace( /<\/pre><\/body><\/html>$/i , "" );
           theContent = theContent.replace( /</gi , "<" );
           theContent = theContent.replace( />/gi , ">" );
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index b3c05f2e2..6d192ad89 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -86,7 +86,7 @@
   [% ELSE %]
     

Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*. - Download the attachment instead. + Download the attachment instead.

[% END %] diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl index 8206a847b..2d505a371 100644 --- a/template/en/default/bug/dependency-graph.html.tmpl +++ b/template/en/default/bug/dependency-graph.html.tmpl @@ -51,16 +51,16 @@

[% IF image_map %] - + Dependency graph [% ELSE %] - + Dependency graph [% END %]
- + -
diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl index 172571900..ff8721653 100644 --- a/template/en/default/bug/process/confirm-duplicate.html.tmpl +++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl @@ -49,7 +49,7 @@ Do you wish to do this?

- + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index a30e89b3c..24766aa04 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -59,7 +59,7 @@ You have the following choices:
  • - + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %] This will cause all of the above changes to be overwritten diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index 0e73f4ad7..7c3e7407f 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -42,7 +42,7 @@ [%###########################################################################%] [% BLOCK bug_display %] - +
    Bug [% bug.bug_id %] - [% bug.short_desc FILTER html %] diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 637fba6b1..4b5ac2f67 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -36,7 +36,7 @@ it to [% Param("maintainer") %] with details of what you were doing at the time this message appeared.

    - diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index 807c316b6..d8c443775 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -43,7 +43,7 @@ Actions:
+ New | Query | @@ -63,19 +63,19 @@ Edit prefs - [% ", parameters" + [% ', parameters' IF user.groups.tweakparams %] - [% ", users" IF user.groups.editusers + [% ', users' IF user.groups.editusers || (user.blessgroupset > 0) %] - [% ", products" + [% ', products' IF user.groups.editcomponents %] - [% ", attachment statuses" + [% ', attachment statuses' IF user.groups.editcomponents %] - [% ", groups" + [% ', groups' IF user.groups.creategroups %] - [% ", keywords" + [% ', keywords' IF user.groups.editkeywords %] - [% " | Sanity check" + [% ' | Sanity check' IF user.groups.tweakparams %] | Log out [% user.login %] diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index eb8e759be..a9ee9a121 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -247,7 +247,7 @@
-[%# Note: the tag is unclosed at the end of this template %] - [%############################################################################%] [%# Block for SELECT fields #%] [%############################################################################%] -- cgit v1.2.3-24-g4f1b