Commit 89eccc9b authored by terry%netscape.com's avatar terry%netscape.com

Backed out Andrew's patch -- turns out it was doing quoting sublty wrong.

parent 3789246e
...@@ -39,8 +39,8 @@ sub GeneratePersonInput { ...@@ -39,8 +39,8 @@ sub GeneratePersonInput {
} }
sub GeneratePeopleInput { sub GeneratePeopleInput {
my ($field, $size, $def_value) = (@_); my ($field, $def_value) = (@_);
return "<INPUT NAME=\"$field\" SIZE=\"$size\" VALUE=\"$def_value\">"; return "<INPUT NAME=\"$field\" SIZE=45 VALUE=\"$def_value\">";
} }
...@@ -187,15 +187,15 @@ sub make_options { ...@@ -187,15 +187,15 @@ sub make_options {
} }
$last = $item; $last = $item;
if ($isregexp ? $item =~ $default : $default eq $item) { if ($isregexp ? $item =~ $default : $default eq $item) {
$popup .= " <OPTION SELECTED VALUE=\"" . url_quote($item) . "\">" . url_decode($item) . "\n"; $popup .= "<OPTION SELECTED VALUE=\"$item\">$item";
$found = 1; $found = 1;
} else { } else {
$popup .= " <OPTION VALUE=\"" . url_quote($item) . "\">" . url_decode($item) . "\n"; $popup .= "<OPTION VALUE=\"$item\">$item";
} }
} }
} }
if (!$found && $default ne "") { if (!$found && $default ne "") {
$popup .= " <OPTION SELECTED>$default\n"; $popup .= "<OPTION SELECTED>$default";
} }
return $popup; return $popup;
} }
...@@ -203,9 +203,9 @@ sub make_options { ...@@ -203,9 +203,9 @@ sub make_options {
sub make_popup { sub make_popup {
my ($name,$src,$default,$listtype,$onchange) = (@_); my ($name,$src,$default,$listtype,$onchange) = (@_);
my $popup = "<SELECT NAME=\"$name\""; my $popup = "<SELECT NAME=$name";
if ($listtype > 0) { if ($listtype > 0) {
$popup .= " SIZE=\"5\""; $popup .= " SIZE=5";
if ($listtype == 2) { if ($listtype == 2) {
$popup .= " MULTIPLE"; $popup .= " MULTIPLE";
} }
...@@ -246,8 +246,7 @@ sub confirm_login { ...@@ -246,8 +246,7 @@ sub confirm_login {
if ($enteredlogin !~ /^[^@, ]*@[^@, ]*\.[^@, ]*$/) { if ($enteredlogin !~ /^[^@, ]*@[^@, ]*\.[^@, ]*$/) {
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
PutHeader("Invalid e-mail address entered"); print "<H1>Invalid e-mail address entered.</H1>\n";
print "The e-mail address you entered\n"; print "The e-mail address you entered\n";
print "(<b>$enteredlogin</b>) didn't match our minimal\n"; print "(<b>$enteredlogin</b>) didn't match our minimal\n";
print "syntax checking for a legal email address. A legal\n"; print "syntax checking for a legal email address. A legal\n";
...@@ -303,7 +302,7 @@ To use the wonders of bugzilla, you can use the following: ...@@ -303,7 +302,7 @@ To use the wonders of bugzilla, you can use the following:
my $enteredcryptpwd = crypt($enteredpwd, substr($realcryptpwd, 0, 2)); my $enteredcryptpwd = crypt($enteredpwd, substr($realcryptpwd, 0, 2));
if ($realcryptpwd eq "" || $enteredcryptpwd ne $realcryptpwd) { if ($realcryptpwd eq "" || $enteredcryptpwd ne $realcryptpwd) {
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
PutHeader("Login failed."); print "<H1>Login failed.</H1>\n";
print "The username or password you entered is not valid.\n"; print "The username or password you entered is not valid.\n";
print "Please click <b>Back</b> and try again.\n"; print "Please click <b>Back</b> and try again.\n";
exit; exit;
...@@ -345,7 +344,7 @@ To use the wonders of bugzilla, you can use the following: ...@@ -345,7 +344,7 @@ To use the wonders of bugzilla, you can use the following:
if ($loginok ne "1") { if ($loginok ne "1") {
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
PutHeader("Please log in."); print "<H1>Please log in.</H1>\n";
print "I need a legitimate e-mail address and password to continue.\n"; print "I need a legitimate e-mail address and password to continue.\n";
if (!defined $nexturl || $nexturl eq "") { if (!defined $nexturl || $nexturl eq "") {
# Sets nexturl to be argv0, stripping everything up to and # Sets nexturl to be argv0, stripping everything up to and
......
...@@ -39,7 +39,7 @@ select ...@@ -39,7 +39,7 @@ select
short_desc, short_desc,
date_format(creation_ts,'Y-m-d') date_format(creation_ts,'Y-m-d')
from bugs from bugs
where bug_id = '" . $::FORM{'id'} . "'"; where bug_id = $::FORM{'id'}";
SendSQL($query); SendSQL($query);
my %bug; my %bug;
......
...@@ -24,20 +24,20 @@ require "CGI.pl"; ...@@ -24,20 +24,20 @@ require "CGI.pl";
confirm_login(); confirm_login();
if (! defined $::FORM{'pwd1'}) { if (! defined $::FORM{'pwd1'}) {
print "Content-type: text/html\n\n"; print "Content-type: text/html
PutHeader("Change your password");
print " <H1>Change your password</H1>
<FORM METHOD=\"post\"> <form method=post>
<table> <table>
<tr> <tr>
<TD ALIGN=\"right\">Please enter the new password for <b>$::COOKIE{'Bugzilla_login'}</b>:</td> <td align=right>Please enter the new password for <b>$::COOKIE{'Bugzilla_login'}</b>:</td>
<TD><INPUT TYPE=\"password\" NAME=\"pwd1\"></td> <td><input type=password name=pwd1></td>
</tr> </tr>
<tr> <tr>
<TD ALIGN=\"right\">Re-enter your new password:</td> <td align=right>Re-enter your new password:</td>
<TD><INPUT TYPE=\"password\" name=\"pwd2\"></td> <td><input type=password name=pwd2></td>
</table> </table>
<INPUT TYPE=\"submit\" VALUE=\"Submit\">\n"; <input type=submit value=Submit>\n";
exit; exit;
} }
...@@ -85,4 +85,4 @@ SendSQL("update logincookies set cryptpassword = '$encrypted' where cookie = $:: ...@@ -85,4 +85,4 @@ SendSQL("update logincookies set cryptpassword = '$encrypted' where cookie = $::
print "<H1>OK, done.</H1> print "<H1>OK, done.</H1>
Your new password has been set. Your new password has been set.
<p> <p>
<A HREF=\"query.cgi\">Back to query page.</A>\n"; <a href=query.cgi>Back to query page.</a>\n";
...@@ -24,6 +24,8 @@ use strict; ...@@ -24,6 +24,8 @@ use strict;
require "CGI.pl"; require "CGI.pl";
print "Content-type: text/html\n";
# The master list not only says what fields are possible, but what order # The master list not only says what fields are possible, but what order
# they get displayed in. # they get displayed in.
...@@ -47,8 +49,8 @@ if (defined $::FORM{'rememberedquery'}) { ...@@ -47,8 +49,8 @@ if (defined $::FORM{'rememberedquery'}) {
my $list = join(" ", @collist); my $list = join(" ", @collist);
print "Set-Cookie: COLUMNLIST=$list ; path=/ ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n"; print "Set-Cookie: COLUMNLIST=$list ; path=/ ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n"; print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n";
print "Content-type: text/html\n\n"; print "\n";
PutHeader("What a hack"); print "<TITLE>What a hack.</TITLE>\n";
print "Resubmitting your query with new columns...\n"; print "Resubmitting your query with new columns...\n";
exit; exit;
} }
...@@ -59,9 +61,6 @@ if (defined $::COOKIE{'COLUMNLIST'}) { ...@@ -59,9 +61,6 @@ if (defined $::COOKIE{'COLUMNLIST'}) {
@collist = @::default_column_list; @collist = @::default_column_list;
} }
print "Content-type: text/html\n\n";
PutHeader("Column Change");
my %desc; my %desc;
foreach my $i (@masterlist) { foreach my $i (@masterlist) {
...@@ -72,11 +71,12 @@ $desc{'summary'} = "Summary (first 60 characters)"; ...@@ -72,11 +71,12 @@ $desc{'summary'} = "Summary (first 60 characters)";
$desc{'summaryfull'} = "Full Summary"; $desc{'summaryfull'} = "Full Summary";
print "\n";
print "Check which columns you wish to appear on the list, and then click\n"; print "Check which columns you wish to appear on the list, and then click\n";
print "on submit.\n"; print "on submit.\n";
print "<p>\n"; print "<p>\n";
print "<FORM ACTION=\"colchange.cgi\">\n"; print "<FORM ACTION=colchange.cgi>\n";
print "<INPUT TYPE=\"HIDDEN\" NAME=\"rememberedquery\" VALUE=\"$::buffer\">\n"; print "<INPUT TYPE=HIDDEN NAME=rememberedquery VALUE=$::buffer>\n";
foreach my $i (@masterlist) { foreach my $i (@masterlist) {
my $c; my $c;
...@@ -85,13 +85,13 @@ foreach my $i (@masterlist) { ...@@ -85,13 +85,13 @@ foreach my $i (@masterlist) {
} else { } else {
$c = ''; $c = '';
} }
print "<INPUT TYPE=\"checkbox\" NAME=\"column_$i\" $c>$desc{$i}<br>\n"; print "<INPUT TYPE=checkbox NAME=column_$i $c>$desc{$i}<br>\n";
} }
print "<P>\n"; print "<P>\n";
print "<INPUT TYPE=\"submit\" VALUE=\"Submit\">\n"; print "<INPUT TYPE=\"submit\" VALUE=\"Submit\">\n";
print "</FORM>\n"; print "</FORM>\n";
print "<FORM ACTION=\"colchange.cgi\">\n"; print "<FORM ACTION=colchange.cgi>\n";
print "<INPUT TYPE=\"HIDDEN\" NAME=\"rememberedquery\" VALUE=\"$::buffer\">\n"; print "<INPUT TYPE=HIDDEN NAME=rememberedquery VALUE=$::buffer>\n";
print "<INPUT TYPE=\"HIDDEN\" NAME=\"resetit\" VALUE=\"1\">\n"; print "<INPUT TYPE=HIDDEN NAME=resetit VALUE=1>\n";
print "<INPUT TYPE=\"submit\" VALUE=\"Reset to Bugzilla default\">\n"; print "<INPUT TYPE=\"submit\" VALUE=\"Reset to Bugzilla default\">\n";
print "</FORM>\n"; print "</FORM>\n";
...@@ -68,5 +68,5 @@ foreach my $update (@updates) { ...@@ -68,5 +68,5 @@ foreach my $update (@updates) {
} }
print "OK, done.<p>\n"; print "OK, done.<p>\n";
print "<A HREF=\"editowners.cgi\">Edit the owners some more.</A>\n<P>\n"; print "<a href=editowners.cgi>Edit the owners some more.</a><p>\n";
print "<A HREF=\"query.cgi\">Go back to the query page.</A>\n"; print "<a href=query.cgi>Go back to the query page.</a>\n";
...@@ -70,6 +70,6 @@ foreach my $i (@::param_list) { ...@@ -70,6 +70,6 @@ foreach my $i (@::param_list) {
WriteParams(); WriteParams();
print "OK, done.<p>\n"; print "OK, done.<p>\n";
print "<A HREF=\"editparams.cgi\">Edit the params some more.</A>\n<P>\n"; print "<a href=editparams.cgi>Edit the params some more.</a><p>\n";
print "<A HREF=\"query.cgi\">Go back to the query page.</A>\n"; print "<a href=query.cgi>Go back to the query page.</a>\n";
...@@ -44,9 +44,9 @@ PutHeader("Edit Component Owners"); ...@@ -44,9 +44,9 @@ PutHeader("Edit Component Owners");
print "This lets you edit the owners of the program components of bugzilla.\n"; print "This lets you edit the owners of the program components of bugzilla.\n";
print "<FORM METHOD=\"POST\" ACTION=\"doeditowners.cgi\">\n<TABLE>\n"; print "<form method=post action=doeditowners.cgi><table>\n";
my $rowbreak = "<TR><TD COLSPAN=\"2\"><HR></TD></TR>"; my $rowbreak = "<tr><td colspan=2><hr></td></tr>";
SendSQL("select program, value, initialowner from components order by program, value"); SendSQL("select program, value, initialowner from components order by program, value");
...@@ -56,17 +56,17 @@ my $curProgram = ""; ...@@ -56,17 +56,17 @@ my $curProgram = "";
while (@line = FetchSQLData()) { while (@line = FetchSQLData()) {
if ($line[0] ne $curProgram) { if ($line[0] ne $curProgram) {
print $rowbreak; print $rowbreak;
print "<TR><TH ALIGN=\"RIGHT\" VALIGN=\"TOP\">$line[0]:</TH><TD></TD></TR>\n"; print "<tr><th align=right valign=top>$line[0]:</th><td></td></tr>\n";
$curProgram = $line[0]; $curProgram = $line[0];
} }
print "<TR><TD VALIGN=\"TOP\">$line[1]</TD><TD><INPUT SIZE=\"80\" "; print "<tr><td valign = top>$line[1]</td><td><input size=80 ";
print "name=\"$line[0]_$line[1]\" value=\"$line[2]\"></td></tr>\n"; print "name=\"$line[0]_$line[1]\" value=\"$line[2]\"></td></tr>\n";
} }
print "</table>\n"; print "</table>\n";
print "<INPUT TYPE=\"submit\" VALUE=\"Submit changes\">\n"; print "<input type=submit value=\"Submit changes\">\n";
print "</form>\n"; print "</form>\n";
print "<P><A HREF=\"query.cgi\">Skip all this, and go back to the query page</A>\n"; print "<p><a href=query.cgi>Skip all this, and go back to the query page</a>\n";
...@@ -49,23 +49,23 @@ print "Be careful!\n"; ...@@ -49,23 +49,23 @@ print "Be careful!\n";
print "<p>\n"; print "<p>\n";
print "Any item you check Reset on will get reset to its default value.\n"; print "Any item you check Reset on will get reset to its default value.\n";
print "<FORM METHOD=\"POST\" ACTION=\"doeditparams.cgi\">\n<TABLE>\n"; print "<form method=post action=doeditparams.cgi><table>\n";
my $rowbreak = "<TR><TD COLSPAN=\"2\"><HR></TD></TR>"; my $rowbreak = "<tr><td colspan=2><hr></td></tr>";
print $rowbreak; print $rowbreak;
foreach my $i (@::param_list) { foreach my $i (@::param_list) {
print "<TR><TH ALIGN=\"RIGHT\" VALIGN=\"TOP\">$i:</TH><TD>$::param_desc{$i}</TD></TR>\n"; print "<tr><th align=right valign=top>$i:</th><td>$::param_desc{$i}</td></tr>\n";
print "<TR><TD VALIGN=\"TOP\"><INPUT TYPE=\"checkbox\" NAME=\"reset-$i\">Reset</TD><TD>\n"; print "<tr><td valign=top><input type=checkbox name=reset-$i>Reset</td><td>\n";
my $value = Param($i); my $value = Param($i);
SWITCH: for ($::param_type{$i}) { SWITCH: for ($::param_type{$i}) {
/^t$/ && do { /^t$/ && do {
print "<INPUT SIZE=\"80\" NAME=\"$i\" VALUE=\"" . print "<input size=80 name=$i value=\"" .
value_quote($value) . '">\n'; value_quote($value) . '">\n';
last SWITCH; last SWITCH;
}; };
/^l$/ && do { /^l$/ && do {
print "<TEXTAREA WRAP=\"HARD\" NAME=\"$i\" ROWS=\"10\" COLS=\"80\">" . print "<textarea wrap=hard name=$i rows=10 cols=80>" .
value_quote($value) . "</textarea>\n"; value_quote($value) . "</textarea>\n";
last SWITCH; last SWITCH;
}; };
...@@ -79,18 +79,18 @@ foreach my $i (@::param_list) { ...@@ -79,18 +79,18 @@ foreach my $i (@::param_list) {
$on = ""; $on = "";
$off = "checked"; $off = "checked";
} }
print "<INPUT TYPE=\"radio\" NAME=\"$i\" VALUE=\"1\" $on>On\n"; print "<input type=radio name=$i value=1 $on>On\n";
print "<INPUT TYPE=\"radio\" NAME=\"$i\" VALUE=\"0\" $off>Off\n"; print "<input type=radio name=$i value=0 $off>Off\n";
last SWITCH; last SWITCH;
}; };
# DEFAULT # DEFAULT
print "<FONT COLOR=\"red\"><BLINK>Unknown param type $::param_type{$i}!!!</BLINK></FONT>\n"; print "<font color=red><blink>Unknown param type $::param_type{$i}!!!</blink></font>\n";
} }
print "</td></tr>\n"; print "</td></tr>\n";
print $rowbreak; print $rowbreak;
} }
print "<TR><TH ALIGN=\"RIGHT\" VALIGN=\"TOP\">version:</TH><TD> print "<tr><th align=right valign=top>version:</th><td>
What version of Bugzilla this is. This can't be modified here, but What version of Bugzilla this is. This can't be modified here, but
<tt>%version%</tt> can be used as a parameter in places that understand <tt>%version%</tt> can be used as a parameter in places that understand
such parameters</td></tr> such parameters</td></tr>
...@@ -98,9 +98,9 @@ such parameters</td></tr> ...@@ -98,9 +98,9 @@ such parameters</td></tr>
print "</table>\n"; print "</table>\n";
print "<INPUT TYPE=\"reset\" VALUE=\"Reset form\"><BR>\n"; print "<input type=reset value=\"Reset form\"><br>\n";
print "<INPUT TYPE=\"submit\" VALUE=\"Submit changes\">\n"; print "<input type=submit value=\"Submit changes\">\n";
print "</form>\n"; print "</form>\n";
print "<P><A HREF=\"query.cgi\">Skip all this, and go back to the query page</A>\n"; print "<p><a href=query.cgi>Skip all this, and go back to the query page</a>\n";
...@@ -43,9 +43,9 @@ if (!defined $::FORM{'product'}) { ...@@ -43,9 +43,9 @@ if (!defined $::FORM{'product'}) {
print "a bug.</H2>\n"; print "a bug.</H2>\n";
print "<table>"; print "<table>";
foreach my $p (sort (@prodlist)) { foreach my $p (sort (@prodlist)) {
print "<TR><TH ALIGN=\"RIGHT\" VALIGN=\"TOP\"><A HREF=\"enter_bug.cgi?product=" . url_quote($p) . "\"&$::buffer>$p</A>:</TH>\n"; print "<tr><th align=right valign=top><a href=\"enter_bug.cgi?product=" . url_quote($p) . "\"&$::buffer>$p</a>:</th>\n";
if (defined $::proddesc{$p}) { if (defined $::proddesc{$p}) {
print "<TD VALIGN=\"TOP\">$::proddesc{$p}</TD>\n"; print "<td valign=top>$::proddesc{$p}</td>\n";
} }
print "</tr>"; print "</tr>";
} }
...@@ -55,7 +55,7 @@ if (!defined $::FORM{'product'}) { ...@@ -55,7 +55,7 @@ if (!defined $::FORM{'product'}) {
$::FORM{'product'} = $prodlist[0]; $::FORM{'product'} = $prodlist[0];
} }
my $product = url_decode($::FORM{'product'}); my $product = $::FORM{'product'};
confirm_login(); confirm_login();
...@@ -149,7 +149,7 @@ GetVersionTable(); ...@@ -149,7 +149,7 @@ GetVersionTable();
my $assign_element = GeneratePersonInput('assigned_to', 1, my $assign_element = GeneratePersonInput('assigned_to', 1,
formvalue('assigned_to')); formvalue('assigned_to'));
my $cc_element = GeneratePeopleInput('cc', 45, formvalue('cc')); my $cc_element = GeneratePeopleInput('cc', formvalue('cc'));
my $priority_popup = make_popup('priority', \@::legal_priority, my $priority_popup = make_popup('priority', \@::legal_priority,
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
# Netscape Communications Corporation. All Rights Reserved. # Netscape Communications Corporation. All Rights Reserved.
# #
# Contributor(s): Terry Weissman <terry@mozilla.org> # Contributor(s): Terry Weissman <terry@mozilla.org>
# Andrew Anderson <andrew@redhat.com>
use diagnostics; use diagnostics;
...@@ -35,19 +34,17 @@ $zz = $zz . $zz; ...@@ -35,19 +34,17 @@ $zz = $zz . $zz;
confirm_login(); confirm_login();
my $platform = url_quote($::FORM{'product'}); print "Set-Cookie: PLATFORM=$::FORM{'product'} ; path=/ ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
my $version = url_quote($::FORM{'version'}); print "Set-Cookie: VERSION-$::FORM{'product'}=$::FORM{'version'} ; path=/ ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
print "Set-Cookie: PLATFORM=$platform ; path=/ ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
print "Set-Cookie: VERSION-$platform=$version ; path=/ ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
if (defined $::FORM{'maketemplate'}) { if (defined $::FORM{'maketemplate'}) {
PutHeader("Bookmarks are your friend.", "Template constructed."); print "<TITLE>Bookmarks are your friend.</TITLE>\n";
print "<H1>Template constructed.</H1>\n";
my $url = "enter_bug.cgi?$::buffer"; my $url = "enter_bug.cgi?$::buffer";
print "If you put a bookmark <A HREF=\"$url\">to this link</A>, it will\n"; print "If you put a bookmark <a href=\"$url\">to this link</a>, it will\n";
print "bring up the submit-a-new-bug page with the fields initialized\n"; print "bring up the submit-a-new-bug page with the fields initialized\n";
print "as you've requested.\n"; print "as you've requested.\n";
exit; exit;
...@@ -121,8 +118,6 @@ foreach my $person (keys %ccids) { ...@@ -121,8 +118,6 @@ foreach my $person (keys %ccids) {
print "<H2>Changes Submitted</H2>\n"; print "<H2>Changes Submitted</H2>\n";
print "<A HREF=\"show_bug.cgi?id=$id\">Show BUG# $id</A>\n"; print "<A HREF=\"show_bug.cgi?id=$id\">Show BUG# $id</A>\n";
print "<BR><A HREF=\"query.cgi\">Back To Query Page</A>\n"; print "<BR><A HREF=\"query.cgi\">Back To Query Page</A>\n";
print "<BR><A HREF=\"enter_bug.cgi?product=" . url_quote($::FORM{'product'}). "\">Enter a new bug</A>\n";
system("./processmail $id < /dev/null > /dev/null 2> /dev/null &"); system("./processmail $id < /dev/null > /dev/null 2> /dev/null &");
exit; exit;
...@@ -37,14 +37,11 @@ print "Content-type: text/html\n\n"; ...@@ -37,14 +37,11 @@ print "Content-type: text/html\n\n";
GetVersionTable(); GetVersionTable();
if ($::FORM{'product'} ne $::dontchange) { if ($::FORM{'product'} ne $::dontchange) {
my $prod = url_decode($::FORM{'product'}); my $prod = $::FORM{'product'};
my $version = url_decode($::FORM{'version'}); my $vok = lsearch($::versions{$prod}, $::FORM{'version'}) >= 0;
my $component = url_decode($::FORM{'component'}); my $cok = lsearch($::components{$prod}, $::FORM{'component'}) >= 0;
my $vok = lsearch($::versions{$prod}, $version) >= 0;
my $cok = lsearch($::components{$prod}, $component) >= 0;
if (!$vok || !$cok) { if (!$vok || !$cok) {
print "<H1>Changing product means changing version and component.</H1>\n"; print "<H1>Changing product means changing version and component.</H1>\n";
print "You have chosen a new product, and now the version and/or\n"; print "You have chosen a new product, and now the version and/or\n";
print "component fields are not correct. (Or, possibly, the bug did\n"; print "component fields are not correct. (Or, possibly, the bug did\n";
print "not have a valid component or version field in the first place.)\n"; print "not have a valid component or version field in the first place.)\n";
...@@ -52,26 +49,26 @@ if ($::FORM{'product'} ne $::dontchange) { ...@@ -52,26 +49,26 @@ if ($::FORM{'product'} ne $::dontchange) {
print "<form>\n"; print "<form>\n";
print "<table>\n"; print "<table>\n";
print "<tr>\n"; print "<tr>\n";
print "<td align=\"right\"><b>Product:</b></td>\n"; print "<td align=right><b>Product:</b></td>\n";
print "<td>$prod</td>\n"; print "<td>$prod</td>\n";
print "</tr><tr>\n"; print "</tr><tr>\n";
print "<td align=\"right\"><b>Version:</b></td>\n"; print "<td align=right><b>Version:</b></td>\n";
print "<td>" . Version_element($version, $prod) . "</td>\n"; print "<td>" . Version_element($::FORM{'version'}, $prod) . "</td>\n";
print "</tr><tr>\n"; print "</tr><tr>\n";
print "<td align=\"right\"><b>Component:</b></td>\n"; print "<td align=right><b>Component:</b></td>\n";
print "<td>" . Component_element($component, $prod) . "</td>\n"; print "<td>" . Component_element($::FORM{'component'}, $prod) . "</td>\n";
print "</tr>\n"; print "</tr>\n";
print "</table>\n"; print "</table>\n";
foreach my $i (keys %::FORM) { foreach my $i (keys %::FORM) {
if ($i ne 'version' && $i ne 'component') { if ($i ne 'version' && $i ne 'component') {
print "<input type=\"hidden\" name=\"$i\" value=\"" . print "<input type=hidden name=$i value=\"" .
value_quote($::FORM{$i}) . "\">\n"; value_quote($::FORM{$i}) . "\">\n";
} }
} }
print "<input type=\"submit\" value=\"Commit\">\n"; print "<input type=submit value=Commit>\n";
print "</form>\n"; print "</form>\n";
print "</hr>\n"; print "</hr>\n";
print "<A HREF=\"query.cgi\">Cancel all this and go back to the query page.</A>\n"; print "<a href=query.cgi>Cancel all this and go back to the query page.</a>\n";
exit; exit;
} }
} }
...@@ -92,6 +89,11 @@ if (!defined $::FORM{'who'}) { ...@@ -92,6 +89,11 @@ if (!defined $::FORM{'who'}) {
$::FORM{'who'} = $::COOKIE{'Bugzilla_login'}; $::FORM{'who'} = $::COOKIE{'Bugzilla_login'};
} }
print "<TITLE>Update Bug " . join(" ", @idlist) . "</TITLE>\n";
if (defined $::FORM{'id'}) {
navigation_header();
}
print "<HR>\n";
$::query = "update bugs\nset"; $::query = "update bugs\nset";
$::comma = ""; $::comma = "";
umask(0); umask(0);
...@@ -117,7 +119,6 @@ sub ChangeResolution { ...@@ -117,7 +119,6 @@ sub ChangeResolution {
} }
} }
ConnectToDatabase();
foreach my $field ("rep_platform", "priority", "bug_severity", "url", foreach my $field ("rep_platform", "priority", "bug_severity", "url",
"summary", "component", "bug_file_loc", "short_desc", "summary", "component", "bug_file_loc", "short_desc",
...@@ -125,11 +126,15 @@ foreach my $field ("rep_platform", "priority", "bug_severity", "url", ...@@ -125,11 +126,15 @@ foreach my $field ("rep_platform", "priority", "bug_severity", "url",
if (defined $::FORM{$field}) { if (defined $::FORM{$field}) {
if ($::FORM{$field} ne $::dontchange) { if ($::FORM{$field} ne $::dontchange) {
DoComma(); DoComma();
$::query .= "$field = " . SqlQuote(url_decode($::FORM{$field})); $::query .= "$field = " . SqlQuote($::FORM{$field});
} }
} }
} }
ConnectToDatabase();
SWITCH: for ($::FORM{'knob'}) { SWITCH: for ($::FORM{'knob'}) {
/^none$/ && do { /^none$/ && do {
last SWITCH; last SWITCH;
...@@ -162,8 +167,8 @@ SWITCH: for ($::FORM{'knob'}) { ...@@ -162,8 +167,8 @@ SWITCH: for ($::FORM{'knob'}) {
} }
ChangeStatus('NEW'); ChangeStatus('NEW');
SendSQL("select initialowner from components where program=" . SendSQL("select initialowner from components where program=" .
SqlQuote(url_decode($::FORM{'product'})) . " and value=" . SqlQuote($::FORM{'product'}) . " and value=" .
SqlQuote(url_decode($::FORM{'component'}))); SqlQuote($::FORM{'component'}));
my $newname = FetchOneColumn(); my $newname = FetchOneColumn();
my $newid = DBNameToIdAndCheck($newname, 1); my $newid = DBNameToIdAndCheck($newname, 1);
DoComma(); DoComma();
...@@ -172,7 +177,6 @@ SWITCH: for ($::FORM{'knob'}) { ...@@ -172,7 +177,6 @@ SWITCH: for ($::FORM{'knob'}) {
}; };
/^reopen$/ && do { /^reopen$/ && do {
ChangeStatus('REOPENED'); ChangeStatus('REOPENED');
ChangeResolution('');
last SWITCH; last SWITCH;
}; };
/^verify$/ && do { /^verify$/ && do {
...@@ -193,8 +197,7 @@ SWITCH: for ($::FORM{'knob'}) { ...@@ -193,8 +197,7 @@ SWITCH: for ($::FORM{'knob'}) {
exit; exit;
} }
if ($::FORM{'dup_id'} == $::FORM{'id'}) { if ($::FORM{'dup_id'} == $::FORM{'id'}) {
PutHeader("Nice try."); print "Nice try. But it doesn't really make sense to mark a\n";
print "But it doesn't really make sense to mark a\n";
print "bug as a duplicate of itself, does it?\n"; print "bug as a duplicate of itself, does it?\n";
exit; exit;
} }
...@@ -210,7 +213,6 @@ SWITCH: for ($::FORM{'knob'}) { ...@@ -210,7 +213,6 @@ SWITCH: for ($::FORM{'knob'}) {
if ($#idlist < 0) { if ($#idlist < 0) {
PutHeader("Nothing to modify");
print "You apparently didn't choose any bugs to modify.\n"; print "You apparently didn't choose any bugs to modify.\n";
print "<p>Click <b>Back</b> and try again.\n"; print "<p>Click <b>Back</b> and try again.\n";
exit; exit;
...@@ -229,7 +231,7 @@ my $basequery = $::query; ...@@ -229,7 +231,7 @@ my $basequery = $::query;
sub SnapShotBug { sub SnapShotBug {
my ($id) = (@_); my ($id) = (@_);
SendSQL("select " . join(',', @::log_columns) . SendSQL("select " . join(',', @::log_columns) .
" from bugs where bug_id = '" . $id . "'"); " from bugs where bug_id = $id");
return FetchSQLData(); return FetchSQLData();
} }
...@@ -238,7 +240,7 @@ foreach my $id (@idlist) { ...@@ -238,7 +240,7 @@ foreach my $id (@idlist) {
SendSQL("lock tables bugs write, bugs_activity write, cc write, profiles write"); SendSQL("lock tables bugs write, bugs_activity write, cc write, profiles write");
my @oldvalues = SnapShotBug($id); my @oldvalues = SnapShotBug($id);
my $query = "$basequery\nwhere bug_id = '" . $id . "'"; my $query = "$basequery\nwhere bug_id = $id";
# print "<PRE>$query</PRE>\n"; # print "<PRE>$query</PRE>\n";
...@@ -259,7 +261,7 @@ foreach my $id (@idlist) { ...@@ -259,7 +261,7 @@ foreach my $id (@idlist) {
} }
} }
SendSQL("delete from cc where bug_id = '" . $id . "'"); SendSQL("delete from cc where bug_id = $id");
foreach my $ccid (keys %ccids) { foreach my $ccid (keys %ccids) {
SendSQL("insert into cc (bug_id, who) values ($id, $ccid)"); SendSQL("insert into cc (bug_id, who) values ($id, $ccid)");
} }
...@@ -274,8 +276,7 @@ foreach my $id (@idlist) { ...@@ -274,8 +276,7 @@ foreach my $id (@idlist) {
if ($old ne $new) { if ($old ne $new) {
if (!defined $whoid) { if (!defined $whoid) {
$whoid = DBNameToIdAndCheck($::FORM{'who'}); $whoid = DBNameToIdAndCheck($::FORM{'who'});
$query = "select delta_ts from bugs where bug_id = '" . $id . "'"; SendSQL("select delta_ts from bugs where bug_id = $id");
SendSQL($query);
$timestamp = FetchOneColumn(); $timestamp = FetchOneColumn();
} }
if ($col eq 'assigned_to') { if ($col eq 'assigned_to') {
...@@ -286,21 +287,13 @@ foreach my $id (@idlist) { ...@@ -286,21 +287,13 @@ foreach my $id (@idlist) {
$old = SqlQuote($old); $old = SqlQuote($old);
$new = SqlQuote($new); $new = SqlQuote($new);
my $q = "insert into bugs_activity (bug_id,who,when,field,oldvalue,newvalue) values ($id,$whoid,$timestamp,$col,$old,$new)"; my $q = "insert into bugs_activity (bug_id,who,when,field,oldvalue,newvalue) values ($id,$whoid,$timestamp,$col,$old,$new)";
# print "<pre>$q</pre>"; # puts "<pre>$q</pre>"
SendSQL($q); SendSQL($q);
} }
} }
print "<TABLE BORDER=1><TD><H1>Changes Submitted</H1>\n";
PutHeader("Changes submitted for bug $::FORM{'id'}", print "<TD><A HREF=\"show_bug.cgi?id=$id\">Back To BUG# $id</A></TABLE>\n";
"Changes Submitted", $::FORM{'id'});
if (defined $::FORM{'id'}) {
navigation_header();
}
print "<HR>\n<P>\n";
print "<A HREF=\"show_bug.cgi?id=$id\">Back To BUG# $id</A>\n";
print "<BR><A HREF=\"query.cgi\">Back To Query Page</A>\n";
print "<BR><A HREF=\"enter_bug.cgi\">Enter a new bug</A>\n";
SendSQL("unlock tables"); SendSQL("unlock tables");
......
...@@ -99,8 +99,8 @@ print "Set-Cookie: BUGLIST= ...@@ -99,8 +99,8 @@ print "Set-Cookie: BUGLIST=
Content-type: text/html\n\n"; Content-type: text/html\n\n";
GetVersionTable(); GetVersionTable();
my $who = GeneratePeopleInput("assigned_to", 45, $default{"assigned_to"}); my $who = GeneratePeopleInput("assigned_to", $default{"assigned_to"});
my $reporter = GeneratePeopleInput("reporter", 45, $default{"reporter"}); my $reporter = GeneratePeopleInput("reporter", $default{"reporter"});
# Muck the "legal product" list so that the default one is always first (and # Muck the "legal product" list so that the default one is always first (and
...@@ -118,102 +118,97 @@ PutHeader("Bugzilla Query Page", "Query Page"); ...@@ -118,102 +118,97 @@ PutHeader("Bugzilla Query Page", "Query Page");
push @::legal_resolution, "---"; # Oy, what a hack. push @::legal_resolution, "---"; # Oy, what a hack.
print " print "
<FORM NAME=\"queryForm\" METHOD=\"GET\" ACTION=\"buglist.cgi\"> <FORM NAME=queryForm METHOD=GET ACTION=\"buglist.cgi\">
<table> <table>
<tr> <tr>
<th align=\"left\"><A HREF=\"bug_status.html\">Status</a>:</th> <th align=left><A HREF=\"bug_status.html\">Status</a>:</th>
<th align=\"left\"><A HREF=\"bug_status.html\">Resolution</a>:</th> <th align=left><A HREF=\"bug_status.html\">Resolution</a>:</th>
<th align=\"left\"><A HREF=\"bug_status.html#rep_platform\">Platform</a>:</th> <th align=left><A HREF=\"bug_status.html#rep_platform\">Platform</a>:</th>
<th align=\"left\"><A HREF=\"bug_status.html#priority\">Priority</a>:</th> <th align=left><A HREF=\"bug_status.html#priority\">Priority</a>:</th>
<th align=\"left\"><A HREF=\"bug_status.html#severity\">Severity</a>:</th> <th align=left><A HREF=\"bug_status.html#severity\">Severity</a>:</th>
</tr> </tr>
<tr> <tr>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"bug_status\" MULTIPLE SIZE=\"7\"> <SELECT NAME=\"bug_status\" MULTIPLE SIZE=7>
@{[make_options(\@::legal_bug_status, $default{'bug_status'}, $type{'bug_status'})]} @{[make_options(\@::legal_bug_status, $default{'bug_status'}, $type{'bug_status'})]}
</SELECT><P> </SELECT>
</td> </td>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"resolution\" MULTIPLE SIZE=\"7\"> <SELECT NAME=\"resolution\" MULTIPLE SIZE=7>
@{[make_options(\@::legal_resolution, $default{'resolution'}, $type{'resolution'})]} @{[make_options(\@::legal_resolution, $default{'resolution'}, $type{'resolution'})]}
</SELECT><P> </SELECT>
</td> </td>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"rep_platform\" MULTIPLE SIZE=\"7\"> <SELECT NAME=\"rep_platform\" MULTIPLE SIZE=7>
@{[make_options(\@::legal_platform, $default{'rep_platform'}, $type{'rep_platform'})]} @{[make_options(\@::legal_platform, $default{'rep_platform'}, $type{'rep_platform'})]}
</SELECT><P> </SELECT>
</td> </td>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"priority\" MULTIPLE SIZE=\"7\"> <SELECT NAME=\"priority\" MULTIPLE SIZE=7>
@{[make_options(\@::legal_priority, $default{'priority'}, $type{'priority'})]} @{[make_options(\@::legal_priority, $default{'priority'}, $type{'priority'})]}
</SELECT><P> </SELECT>
</td> </td>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"bug_severity\" MULTIPLE SIZE=\"7\"> <SELECT NAME=\"bug_severity\" MULTIPLE SIZE=7>
@{[make_options(\@::legal_severity, $default{'bug_severity'}, $type{'bug_severity'})]} @{[make_options(\@::legal_severity, $default{'bug_severity'}, $type{'bug_severity'})]}
</SELECT><P> </SELECT>
</tr> </tr>
</table> </table>
<p> <p>
<TABLE> <TABLE>
<TR> <TR><TD ALIGN=RIGHT><B><A HREF=\"bug_status.html#assigned_to\">Assigned To:</a></B><TD>$who
<TD ALIGN=\"RIGHT\">
<A HREF=\"bug_status.html#assigned_to\"><B>Assigned To:</B></A>
<TD>$who
<p> <p>
<TR> <TR><TD ALIGN=RIGHT><B>Reporter:</B><TD>$reporter
<TD ALIGN=\"RIGHT\">
<A HREF=\"bug_status.html#reporter\"><B>Reporter:</B></A>
<TD>$reporter
</TABLE> </TABLE>
<NOBR>Changed in the last <INPUT NAME=\"changedin\" SIZE=\"2\"> days.</NOBR> <NOBR>Changed in the last <INPUT NAME=changedin SIZE=2> days.</NOBR>
<P> <P>
<table> <table>
<tr> <tr>
<TH ALIGN=\"LEFT\">Program:</th> <TH ALIGN=LEFT>Program:</th>
<TH ALIGN=\"LEFT\">Version:</th> <TH ALIGN=LEFT>Version:</th>
<TH ALIGN=\"LEFT\">Component:</th> <TH ALIGN=LEFT>Component:</th>
</tr> </tr>
<tr> <tr>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"product\" MULTIPLE SIZE=\"5\"> <SELECT NAME=\"product\" MULTIPLE SIZE=5>
@{[make_options(\@::legal_product, url_decode($default{'product'}), $type{'product'})]} @{[make_options(\@::legal_product, $default{'product'}, $type{'product'})]}
</SELECT><P> </SELECT>
</td> </td>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"version\" MULTIPLE SIZE=\"5\"> <SELECT NAME=\"version\" MULTIPLE SIZE=5>
@{[make_options(\@::legal_versions, $default{'version'}, $type{'version'})]} @{[make_options(\@::legal_versions, $default{'version'}, $type{'version'})]}
</SELECT><P> </SELECT>
</td> </td>
<td align=\"left\" valign=\"top\"> <td align=left valign=top>
<SELECT NAME=\"component\" MULTIPLE SIZE=\"5\"> <SELECT NAME=\"component\" MULTIPLE SIZE=5>
@{[make_options(\@::legal_components, $default{'component'}, $type{'component'})]} @{[make_options(\@::legal_components, $default{'component'}, $type{'component'})]}
</SELECT><P> </SELECT>
</td> </td>
</tr> </tr>
</table> </table>
<table border=\"0\"> <table border=0>
<tr> <tr>
<td align=\"right\">Summary:</td> <td align=right>Summary:</td>
<td><input name=\"short_desc\" size=\"30\"></td> <td><input name=short_desc size=30></td>
<td><input type=\"radio\" name=\"short_desc_type\" value=\"substr\" checked>Substring</td> <td><input type=radio name=short_desc_type value=substr checked>Substring</td>
<td><input type=\"radio\" name=\"short_desc_type\" value=\"regexp\">Regexp</td> <td><input type=radio name=short_desc_type value=regexp>Regexp</td>
</tr> </tr>
<tr> <tr>
<td align=\"right\">Description:</td> <td align=right>Description:</td>
<td><input name=\"long_desc\" size=\"30\"></td> <td><input name=long_desc size=30></td>
<td><input type=\"radio\" name=\"long_desc_type\" value=\"substr\" checked>Substring</td> <td><input type=radio name=long_desc_type value=substr checked>Substring</td>
<td><input type=\"radio\" name=\"long_desc_type\" value=\"regexp\">Regexp</td> <td><input type=radio name=long_desc_type value=regexp>Regexp</td>
</tr> </tr>
</table> </table>
<p> <p>
...@@ -221,27 +216,27 @@ print " ...@@ -221,27 +216,27 @@ print "
<BR> <BR>
<INPUT TYPE=\"radio\" NAME=\"cmdtype\" VALUE=\"doit\" CHECKED> Run this query <INPUT TYPE=radio NAME=cmdtype VALUE=doit CHECKED> Run this query
<BR> <BR>
"; ";
if ($namelist ne "") { if ($namelist ne "") {
print " print "
<table cellspacing=\"0\" cellpadding=\"0\"><tr> <table cellspacing=0 cellpadding=0><tr>
<td><INPUT TYPE=\"radio\" NAME=\"cmdtype\" VALUE=\"editnamed\"> Load the remembered query:</td> <td><INPUT TYPE=radio NAME=cmdtype VALUE=editnamed> Load the remembered query:</td>
<td rowspan=\"3\"><select name=\"namedcmd\">$namelist</select> <td rowspan=3><select name=namedcmd>$namelist</select>
</tr><tr> </tr><tr>
<td><INPUT TYPE=\"radio\" NAME=\"cmdtype\" VALUE=\"runnamed\"> Run the remembered query:</td> <td><INPUT TYPE=radio NAME=cmdtype VALUE=runnamed> Run the remembered query:</td>
</tr><tr> </tr><tr>
<td><INPUT TYPE=\"radio\" NAME=\"cmdtype\" VALUE=\"forgetnamed\"> Forget the remembered query:</td> <td><INPUT TYPE=radio NAME=cmdtype VALUE=forgetnamed> Forget the remembered query:</td>
</tr></table>" </tr></table>"
} }
print " print "
<INPUT TYPE=\"radio\" NAME=\"cmdtype\" VALUE=\"asdefault\"> Remember this as the default query <INPUT TYPE=radio NAME=cmdtype VALUE=asdefault> Remember this as the default query
<BR> <BR>
<INPUT TYPE=\"radio\" NAME=\"cmdtype\" VALUE=\"asnamed\"> Remember this query, and name it: <INPUT TYPE=radio NAME=cmdtype VALUE=asnamed> Remember this query, and name it:
<INPUT TYPE=\"text\" NAME=\"newqueryname\"> <INPUT TYPE=text NAME=newqueryname>
<BR> <BR>
<NOBR><B>Sort By:</B> <NOBR><B>Sort By:</B>
...@@ -252,7 +247,7 @@ print " ...@@ -252,7 +247,7 @@ print "
</SELECT></NOBR> </SELECT></NOBR>
<INPUT TYPE=\"submit\" VALUE=\"Submit\"> <INPUT TYPE=\"submit\" VALUE=\"Submit\">
<INPUT TYPE=\"reset\" VALUE=\"Reset back to the default query\"> <INPUT TYPE=\"reset\" VALUE=\"Reset back to the default query\">
<INPUT TYPE=\"hidden\" name=\"form_name\" VALUE=\"query\"> <INPUT TYPE=hidden name=form_name VALUE=query>
<BR>Give me a <A HREF=\"help.html\">clue</A> about how to use this form. <BR>Give me a <A HREF=\"help.html\">clue</A> about how to use this form.
</CENTER> </CENTER>
</FORM> </FORM>
...@@ -262,14 +257,14 @@ print " ...@@ -262,14 +257,14 @@ print "
if (defined $::COOKIE{"Bugzilla_login"}) { if (defined $::COOKIE{"Bugzilla_login"}) {
if ($::COOKIE{"Bugzilla_login"} eq Param("maintainer")) { if ($::COOKIE{"Bugzilla_login"} eq Param("maintainer")) {
print "<a href=\"editparams.cgi\">Edit Bugzilla operating parameters</a><br>\n"; print "<a href=editparams.cgi>Edit Bugzilla operating parameters</a><br>\n";
print "<a href=\"editowners.cgi\">Edit Bugzilla component owners</a><br>\n"; print "<a href=editowners.cgi>Edit Bugzilla component owners</a><br>\n";
} }
print "<a href=\"relogin.cgi\">Log in as someone besides <b>$::COOKIE{'Bugzilla_login'}</b></a><br>\n"; print "<a href=relogin.cgi>Log in as someone besides <b>$::COOKIE{'Bugzilla_login'}</b></a><br>\n";
} }
print "<a href=\"changepassword.cgi\">Change your password.</a><br>\n"; print "<a href=changepassword.cgi>Change your password.</a><br>\n";
print "<a href=\"enter_bug.cgi\">Enter a new bug.</a><br>\n"; print "<a href=\"enter_bug.cgi\">Create a new bug.</a><br>\n";
print "<a href=\"reports.cgi\">Bug reports.</a><br>\n"; print "<a href=\"reports.cgi\">Bug reports</a><br>\n";
......
...@@ -30,13 +30,11 @@ Set-Cookie: Bugzilla_logincookie= ; path=/; expires=Sun, 30-Jun-80 00:00:00 GMT ...@@ -30,13 +30,11 @@ Set-Cookie: Bugzilla_logincookie= ; path=/; expires=Sun, 30-Jun-80 00:00:00 GMT
Set-Cookie: Bugzilla_password= ; path=/; expires=Sun, 30-Jun-80 00:00:00 GMT Set-Cookie: Bugzilla_password= ; path=/; expires=Sun, 30-Jun-80 00:00:00 GMT
Content-type: text/html Content-type: text/html
"; <H1>Your login has been forgotten.</H1>
PutHeader("Your login has been forgotten");
print "
The cookie that was remembering your login is now gone. The next time you The cookie that was remembering your login is now gone. The next time you
do an action that requires a login, you will be prompted for it. do an action that requires a login, you will be prompted for it.
<p> <p>
<A HREF=\"query.cgi\">Back to the query page.</A> <a href=query.cgi>Back to the query page.</a>
"; ";
exit; exit;
......
...@@ -156,12 +156,11 @@ FIN ...@@ -156,12 +156,11 @@ FIN
sub most_doomed sub most_doomed
{ {
my $when = localtime (time); my $when = localtime (time);
my $product = url_decode($::FORM{'product'});
print <<FIN; print <<FIN;
<center> <center>
<h1> <h1>
Bug Report for $product Bug Report for $::FORM{'product'}
</h1> </h1>
$when<p> $when<p>
FIN FIN
...@@ -180,7 +179,7 @@ from bugs, ...@@ -180,7 +179,7 @@ from bugs,
versions projector versions projector
where bugs.assigned_to = assign.userid where bugs.assigned_to = assign.userid
and bugs.reporter = report.userid and bugs.reporter = report.userid
and bugs.product='$product' and bugs.product='$::FORM{'product'}'
and and
( (
bugs.bug_status = 'NEW' or bugs.bug_status = 'NEW' or
...@@ -394,13 +393,13 @@ sub header ...@@ -394,13 +393,13 @@ sub header
FIN FIN
} }
sub show_chart { sub show_chart
{
my $when = localtime (time); my $when = localtime (time);
my $product = url_decode($::FORM{'product'});
if (! is_legal_product($product)) if (! is_legal_product ($::FORM{'product'}))
{ {
&die_politely ("Unknown product: $product"); &die_politely ("Unknown product: $::FORM{'product'}");
} }
print <<FIN; print <<FIN;
...@@ -455,7 +454,7 @@ FIN ...@@ -455,7 +454,7 @@ FIN
my %settings = my %settings =
( (
"title" => "Bug Charts for $product", "title" => "Bug Charts for $::FORM{'product'}",
"x_label" => "Dates", "x_label" => "Dates",
"y_label" => "Bug Count", "y_label" => "Bug Count",
"legend_labels" => \@labels, "legend_labels" => \@labels,
...@@ -477,7 +476,6 @@ FIN ...@@ -477,7 +476,6 @@ FIN
sub die_politely sub die_politely
{ {
my $msg = shift; my $msg = shift;
my $product = url_decode($::FORM{'product'});
print <<FIN; print <<FIN;
<p> <p>
...@@ -486,7 +484,7 @@ sub die_politely ...@@ -486,7 +484,7 @@ sub die_politely
<td align=center> <td align=center>
<font color=blue>Sorry, but ...</font> <font color=blue>Sorry, but ...</font>
<p> <p>
There is no graph available for <b>$product</b><p> There is no graph available for <b>$::FORM{'product'}</b><p>
<font size=-1> <font size=-1>
$msg $msg
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
# Netscape Communications Corporation. All Rights Reserved. # Netscape Communications Corporation. All Rights Reserved.
# #
# Contributor(s): Terry Weissman <terry@mozilla.org> # Contributor(s): Terry Weissman <terry@mozilla.org>
# Andrew Anderson <andrew@redhat.com>
use diagnostics; use diagnostics;
use strict; use strict;
...@@ -43,7 +42,7 @@ sub Alert { ...@@ -43,7 +42,7 @@ sub Alert {
sub BugLink { sub BugLink {
my ($id) = (@_); my ($id) = (@_);
return "<a href=\"show_bug.cgi?id=$id\">$id</a>"; return "<a href='show_bug.cgi?id=$id'>$id</a>";
} }
......
...@@ -22,19 +22,16 @@ ...@@ -22,19 +22,16 @@
use diagnostics; use diagnostics;
use strict; use strict;
use vars @::FORM; print "Content-type: text/html\n";
print "\n";
require "CGI.pl"; require "CGI.pl";
confirm_login(); if (!defined $::FORM{'id'}) {
print "<H2>Search By Bug Number</H2>\n";
print "Content-type: text/html\n\n"; print "<FORM METHOD=GET ACTION=\"show_bug.cgi\">\n";
if (!defined $::FORM{'id'} || $::FORM{'id'} eq "") {
PutHeader("Search By Bug Number", "Search By Bug Number", "");
print "<FORM METHOD=\"GET\" ACTION=\"show_bug.cgi\">\n";
print "You may find a single bug by entering its bug id here: \n"; print "You may find a single bug by entering its bug id here: \n";
print "<INPUT NAME=\"id\">\n"; print "<INPUT NAME=id>\n";
print "<INPUT TYPE=\"submit\" VALUE=\"Show Me This Bug\">\n"; print "<INPUT TYPE=\"submit\" VALUE=\"Show Me This Bug\">\n";
print "</FORM>\n"; print "</FORM>\n";
exit; exit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment