238866 - remove %FORM from query.cgi

Status: RESOLVED FIXED

(Bugzilla :: Bugzilla-General, enhancement, P2)

Description

[Dave Miller [:justdave]]

This should be another easy one

49:    %FORM
56:if (defined $::FORM{"GoAheadAndLogIn"}) {
101:if ($::FORM{'nukedefaultquery'}) {
332:foreach my $cmd (grep(/^cmd-/, keys(%::FORM))) {
334:        $::FORM{"field$1-$2-$3"} = "xyzzy";
338:if (!exists $::FORM{'field0-0-0'}) {
339:    $::FORM{'field0-0-0'} = "xyzzy";
346:for (my $chart = 0; $::FORM{"field$chart-0-0"}; $chart++) {
348:    for (my $row = 0; $::FORM{"field$chart-$row-0"}; $row++) {
350:        for (my $col = 0; $::FORM{"field$chart-$row-$col"}; $col++) {
351:            push(@cols, { field => $::FORM{"field$chart-$row-$col"},
352:                          type => $::FORM{"type$chart-$row-$col"},
353:                          value => $::FORM{"value$chart-$row-$col"} });
384:if ($::FORM{'order'}) { $deforder = $::FORM{'order'} }
390:if (($::FORM{'query_format'} || $::FORM{'format'} || "") eq "create-series") {
398:$vars->{'format'} = $::FORM{'format'};
399:$vars->{'query_format'} = $::FORM{'query_format'};
406:                       $::FORM{'query_format'} || $::FORM{'format'}, 
407:                       $::FORM{'ctype'});

72:    foreach my $i (keys %::COOKIE) {
74:            push(@oldquerycookies, [$1, $i, $::COOKIE{$i}]);
77:    if (defined $::COOKIE{'DEFAULTQUERY'}) {
79:                                $::COOKIE{'DEFAULTQUERY'}]);
379:if ($::COOKIE{'LASTORDER'}) {

Comment 1

[Christian Reis]

Ugh. This one does some evil assignments.

Comment 2

[Christian Reis]

COOKIE done in bug 252379.

Comment 3

[Max Kanat-Alexander]

Shane, did you want to take a stab at this one?

Comment 4

[Teemu Mannermaa (:wicked)]

If you don't mind, I'll take this one.

Comment 5

[Teemu Mannermaa (:wicked)]

Attachment: Remove FORMs, V1

Here is the first attempt for review. I tested login, nuking default query,
different query formats/ctypes, boolean chart manipulation and creating new
series succesfully.

Comment 6

[Gervase Markham [:gerv]]

Comment on attachment 176329 [details] [diff] [review]
Remove FORMs, V1

>@@ -455,7 +455,7 @@
> # format.
> my $format = GetFormat("search/search", 
>                        $vars->{'query_format'} || $vars->{'format'}, 
>-                       $cgi->param('ctype'));
>+                       scalar $cgi->param('ctype'));

Not sure what's going on here. Other than that, r=gerv.

Gerv

Comment 7

[Teemu Mannermaa (:wicked)]

(In reply to comment #6)
Oh, it was already using cgi. I wonder if it worked before then.. That scalar
was needed before in similar cases so that the cgi->param returns the param in
scalar context (undef) instead of a list context (empty list) if there was no
such param. See https://bugzilla.mozilla.org/show_bug.cgi?id=225818#c0.

Comment 8

[Shane H. W. Travis]

Checking in query.cgi;
/cvsroot/mozilla/webtools/bugzilla/query.cgi,v  <--  query.cgi
new revision: 1.142; previous revision: 1.141
done