aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2019-11-30 23:12:11 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2019-12-01 14:53:51 -0800
commit70780e40e5586c6882e33dd65a3dc3f31031a321 (patch)
tree51fc3608bd44e7b92d07a976ca3112fd5d87d843 /show_bug.cgi
parentMerge commit '3395d78cc8b0bd660e56f73a2689d495f2a22628' into bugstest (diff)
downloadbugzilla-70780e40e5586c6882e33dd65a3dc3f31031a321.tar.gz
bugzilla-70780e40e5586c6882e33dd65a3dc3f31031a321.tar.bz2
bugzilla-70780e40e5586c6882e33dd65a3dc3f31031a321.zip
Gentoo-local version of 7f3a749d7bd78a3e4aee163f562d7e95b0954b44 w/ Perl-Tidy-20180220
Reformat all code using Perl-Tidy v20180220 and .perltidyrc from matching upstream 7f3a749d7bd78a3e4aee163f562d7e95b0954b44 commit. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'show_bug.cgi')
-rwxr-xr-xshow_bug.cgi122
1 files changed, 66 insertions, 56 deletions
diff --git a/show_bug.cgi b/show_bug.cgi
index 9e31fc4a7..cf75a8f6f 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -18,24 +18,27 @@ use Bugzilla::Error;
use Bugzilla::Util;
use Bugzilla::Bug;
-my $cgi = Bugzilla->cgi;
+my $cgi = Bugzilla->cgi;
my $template = Bugzilla->template;
-my $vars = {};
+my $vars = {};
my $user = Bugzilla->login();
-my $format = $template->get_format("bug/show", scalar $cgi->param('format'),
- scalar $cgi->param('ctype'));
+my $format = $template->get_format(
+ "bug/show",
+ scalar $cgi->param('format'),
+ scalar $cgi->param('ctype')
+);
# Editable, 'single' HTML bugs are treated slightly specially in a few places
my $single = !$format->{format} && $format->{extension} eq 'html';
# If we don't have an ID, _AND_ we're only doing a single bug, then prompt
if (!$cgi->param('id') && $single) {
- print $cgi->header();
- $template->process("bug/choose.html.tmpl", $vars) ||
- ThrowTemplateError($template->error());
- exit;
+ print $cgi->header();
+ $template->process("bug/choose.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
+ exit;
}
my (@bugs, @illegal_bugs);
@@ -47,51 +50,54 @@ my %marks;
Bugzilla->switch_to_shadow_db unless $user->id;
if ($single) {
- my $id = $cgi->param('id');
- push @bugs, Bugzilla::Bug->check({ id => $id, cache => 1 });
- if (defined $cgi->param('mark')) {
- foreach my $range (split ',', $cgi->param('mark')) {
- if ($range =~ /^(\d+)-(\d+)$/) {
- foreach my $i ($1..$2) {
- $marks{$i} = 1;
- }
- } elsif ($range =~ /^(\d+)$/) {
- $marks{$1} = 1;
- }
+ my $id = $cgi->param('id');
+ push @bugs, Bugzilla::Bug->check({id => $id, cache => 1});
+ if (defined $cgi->param('mark')) {
+ foreach my $range (split ',', $cgi->param('mark')) {
+ if ($range =~ /^(\d+)-(\d+)$/) {
+ foreach my $i ($1 .. $2) {
+ $marks{$i} = 1;
}
+ }
+ elsif ($range =~ /^(\d+)$/) {
+ $marks{$1} = 1;
+ }
+ }
+ }
+}
+else {
+ my $count = 0;
+ foreach my $id ($cgi->param('id')) {
+
+ # Be kind enough and accept URLs of the form: id=1,2,3.
+ my @ids = split(/,/, $id);
+ my @check_bugs;
+
+ foreach my $bug_id (@ids) {
+ last if $count == 100;
+ next unless $bug_id;
+ my $bug = new Bugzilla::Bug({id => $bug_id, cache => 1});
+ if (!$bug->{error}) {
+ push(@check_bugs, $bug);
+ }
+ else {
+ push(@illegal_bugs, {bug_id => trim($bug_id), error => $bug->{error}});
+ }
+ $count++;
}
-} else {
- my $count = 0;
- foreach my $id ($cgi->param('id')) {
- # Be kind enough and accept URLs of the form: id=1,2,3.
- my @ids = split(/,/, $id);
- my @check_bugs;
-
- foreach my $bug_id (@ids) {
- last if $count == 100;
- next unless $bug_id;
- my $bug = new Bugzilla::Bug({ id => $bug_id, cache => 1 });
- if (!$bug->{error}) {
- push(@check_bugs, $bug);
- }
- else {
- push(@illegal_bugs, { bug_id => trim($bug_id), error => $bug->{error} });
- }
- $count++;
- }
- $user->visible_bugs(\@check_bugs);
+ $user->visible_bugs(\@check_bugs);
- foreach my $bug (@check_bugs) {
- if ($user->can_see_bug($bug->id)) {
- push(@bugs, $bug);
- }
- else {
- my $error = 'NotPermitted'; # Trick to make 012throwables.t happy.
- push(@illegal_bugs, { bug_id => $bug->id, error => $error });
- }
- }
+ foreach my $bug (@check_bugs) {
+ if ($user->can_see_bug($bug->id)) {
+ push(@bugs, $bug);
+ }
+ else {
+ my $error = 'NotPermitted'; # Trick to make 012throwables.t happy.
+ push(@illegal_bugs, {bug_id => $bug->id, error => $error});
+ }
}
+ }
}
Bugzilla::Bug->preload(\@bugs);
@@ -99,31 +105,35 @@ Bugzilla::Bug->preload(\@bugs);
$vars->{'bugs'} = [@bugs, @illegal_bugs];
$vars->{'marks'} = \%marks;
-my @bugids = map {$_->bug_id} grep {!$_->error} @bugs;
+my @bugids = map { $_->bug_id } grep { !$_->error } @bugs;
$vars->{'bugids'} = join(", ", @bugids);
# Work out which fields we are displaying (currently XML only.)
# If no explicit list is defined, we show all fields. We then exclude any
-# on the exclusion list. This is so you can say e.g. "Everything except
+# on the exclusion list. This is so you can say e.g. "Everything except
# attachments" without listing almost all the fields.
-my @fieldlist = (Bugzilla::Bug->fields, 'flag', 'group', 'long_desc',
- 'attachment', 'attachmentdata', 'token');
+my @fieldlist = (
+ Bugzilla::Bug->fields, 'flag',
+ 'group', 'long_desc',
+ 'attachment', 'attachmentdata',
+ 'token'
+);
my %displayfields;
if ($cgi->param("field")) {
- @fieldlist = $cgi->param("field");
+ @fieldlist = $cgi->param("field");
}
unless ($user->is_timetracker) {
- @fieldlist = grep($_ !~ /_time$/, @fieldlist);
+ @fieldlist = grep($_ !~ /_time$/, @fieldlist);
}
foreach (@fieldlist) {
- $displayfields{$_} = 1;
+ $displayfields{$_} = 1;
}
foreach ($cgi->param("excludefield")) {
- $displayfields{$_} = undef;
+ $displayfields{$_} = undef;
}
$vars->{'displayfields'} = \%displayfields;