From 8ec8da0491ad89604700b3e29a227966f6d84ba1 Mon Sep 17 00:00:00 2001 From: Perl Tidy Date: Wed, 5 Dec 2018 15:38:52 -0500 Subject: no bug - reformat all the code using the new perltidy rules --- config.cgi | 120 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 64 insertions(+), 56 deletions(-) (limited to 'config.cgi') diff --git a/config.cgi b/config.cgi index 95e9a842d..03d794f6e 100755 --- a/config.cgi +++ b/config.cgi @@ -31,48 +31,50 @@ Bugzilla->switch_to_shadow_db; # If the 'requirelogin' parameter is on and the user is not # authenticated, return empty fields. if (Bugzilla->params->{'requirelogin'} && !$user->id) { - display_data(); - exit; + display_data(); + exit; } # Pass a bunch of Bugzilla configuration to the templates. my $vars = {}; -$vars->{'priority'} = get_legal_field_values('priority'); -$vars->{'severity'} = get_legal_field_values('bug_severity'); -$vars->{'platform'} = get_legal_field_values('rep_platform'); -$vars->{'op_sys'} = get_legal_field_values('op_sys'); +$vars->{'priority'} = get_legal_field_values('priority'); +$vars->{'severity'} = get_legal_field_values('bug_severity'); +$vars->{'platform'} = get_legal_field_values('rep_platform'); +$vars->{'op_sys'} = get_legal_field_values('op_sys'); $vars->{'keyword'} = [map($_->name, Bugzilla::Keyword->get_all)]; $vars->{'resolution'} = get_legal_field_values('resolution'); -$vars->{'status'} = get_legal_field_values('bug_status'); -$vars->{'custom_fields'} = - [ grep {$_->is_select} Bugzilla->active_custom_fields ]; +$vars->{'status'} = get_legal_field_values('bug_status'); +$vars->{'custom_fields'} + = [grep { $_->is_select } Bugzilla->active_custom_fields]; # Include a list of product objects. if ($cgi->param('product')) { - my @products = $cgi->param('product'); - foreach my $product_name (@products) { - # We don't use check() because config.cgi outputs mostly - # in XML and JS and we don't want to display an HTML error - # instead of that. - my $product = new Bugzilla::Product({ name => $product_name }); - if ($product && $user->can_see_product($product->name)) { - push (@{$vars->{'products'}}, $product); - } + my @products = $cgi->param('product'); + foreach my $product_name (@products) { + + # We don't use check() because config.cgi outputs mostly + # in XML and JS and we don't want to display an HTML error + # instead of that. + my $product = new Bugzilla::Product({name => $product_name}); + if ($product && $user->can_see_product($product->name)) { + push(@{$vars->{'products'}}, $product); } -} else { - $vars->{'products'} = $user->get_selectable_products; + } +} +else { + $vars->{'products'} = $user->get_selectable_products; } # We set the 2nd argument to 1 to also preload flag types. -Bugzilla::Product::preload($vars->{'products'}, 1, { is_active => 1 }); +Bugzilla::Product::preload($vars->{'products'}, 1, {is_active => 1}); # Allow consumers to specify whether or not they want flag data. if (defined $cgi->param('flags')) { - $vars->{'show_flags'} = $cgi->param('flags'); + $vars->{'show_flags'} = $cgi->param('flags'); } else { - # We default to sending flag data. - $vars->{'show_flags'} = 1; + # We default to sending flag data. + $vars->{'show_flags'} = 1; } # Create separate lists of open versus resolved statuses. This should really @@ -80,17 +82,22 @@ else { my @open_status; my @closed_status; foreach my $status (@{$vars->{'status'}}) { - is_open_state($status) ? push(@open_status, $status) - : push(@closed_status, $status); + is_open_state($status) + ? push(@open_status, $status) + : push(@closed_status, $status); } -$vars->{'open_status'} = \@open_status; +$vars->{'open_status'} = \@open_status; $vars->{'closed_status'} = \@closed_status; # Generate a list of fields that can be queried. my @fields = @{Bugzilla::Field->match({obsolete => 0})}; + # Exclude fields the user cannot query. if (!Bugzilla->user->is_timetracker) { - @fields = grep { $_->name !~ /^(estimated_time|remaining_time|work_time|percentage_complete|deadline)$/ } @fields; + @fields = grep { + $_->name + !~ /^(estimated_time|remaining_time|work_time|percentage_complete|deadline)$/ + } @fields; } $vars->{'field'} = \@fields; @@ -98,33 +105,34 @@ display_data($vars); sub display_data { - my $vars = shift; - - my $cgi = Bugzilla->cgi; - my $template = Bugzilla->template; - - # Determine how the user would like to receive the output; - # default is JavaScript. - my $format = $template->get_format("config", scalar($cgi->param('format')), - scalar($cgi->param('ctype')) || "js"); - - # Generate the configuration data. - my $output; - $template->process($format->{'template'}, $vars, \$output) - || ThrowTemplateError($template->error()); - - # Wide characters cause md5_base64() to die. - my $digest_data = $output; - utf8::encode($digest_data) if utf8::is_utf8($digest_data); - my $digest = md5_base64($digest_data); - - if ($cgi->check_etag($digest)) { - print $cgi->header(-ETag => $digest, - -status => '304 Not Modified'); - exit; - } + my $vars = shift; + + my $cgi = Bugzilla->cgi; + my $template = Bugzilla->template; + + # Determine how the user would like to receive the output; + # default is JavaScript. + my $format = $template->get_format( + "config", + scalar($cgi->param('format')), + scalar($cgi->param('ctype')) || "js" + ); + + # Generate the configuration data. + my $output; + $template->process($format->{'template'}, $vars, \$output) + || ThrowTemplateError($template->error()); + + # Wide characters cause md5_base64() to die. + my $digest_data = $output; + utf8::encode($digest_data) if utf8::is_utf8($digest_data); + my $digest = md5_base64($digest_data); + + if ($cgi->check_etag($digest)) { + print $cgi->header(-ETag => $digest, -status => '304 Not Modified'); + exit; + } - print $cgi->header (-ETag => $digest, - -type => $format->{'ctype'}); - print $output; + print $cgi->header(-ETag => $digest, -type => $format->{'ctype'}); + print $output; } -- cgit v1.2.3-24-g4f1b