From 8ec8da0491ad89604700b3e29a227966f6d84ba1 Mon Sep 17 00:00:00 2001
From: Perl Tidy <perltidy@bugzilla.org>
Date: Wed, 5 Dec 2018 15:38:52 -0500
Subject: no bug - reformat all the code using the new perltidy rules

---
 extensions/BzAPI/lib/Util.pm | 652 ++++++++++++++++++++++---------------------
 1 file changed, 332 insertions(+), 320 deletions(-)

(limited to 'extensions/BzAPI/lib/Util.pm')

diff --git a/extensions/BzAPI/lib/Util.pm b/extensions/BzAPI/lib/Util.pm
index d50679a6c..6f7e2c025 100644
--- a/extensions/BzAPI/lib/Util.pm
+++ b/extensions/BzAPI/lib/Util.pm
@@ -28,425 +28,437 @@ use MIME::Base64;
 
 use base qw(Exporter);
 our @EXPORT = qw(
-    ref_urlbase
-    fix_bug
-    fix_user
-    fix_flag
-    fix_comment
-    fix_changeset
-    fix_attachment
-    filter_wants_nocache
-    filter
-    fix_credentials
-    filter_email
+  ref_urlbase
+  fix_bug
+  fix_user
+  fix_flag
+  fix_comment
+  fix_changeset
+  fix_attachment
+  filter_wants_nocache
+  filter
+  fix_credentials
+  filter_email
 );
 
 # Return an URL base appropriate for constructing a ref link
 # normally required by REST API calls.
 sub ref_urlbase {
-    return Bugzilla->localconfig->{urlbase} . "bzapi";
+  return Bugzilla->localconfig->{urlbase} . "bzapi";
 }
 
 # convert certain fields within a bug object
 # from a simple scalar value to their respective objects
 sub fix_bug {
-    my ($data, $bug, $stash) = @_;
-    my $dbh    = $stash->{dbh}    //= Bugzilla->dbh;
-    my $params = $stash->{params} //= Bugzilla->input_params;
-    my $rpc    = $stash->{rpc}    //= Bugzilla->request_cache->{bzapi_rpc};
-    my $method = $stash->{method} //= Bugzilla->request_cache->{bzapi_rpc_method};
-
-    $bug = ref $bug ? $bug : Bugzilla::Bug->check($bug || $data->{id});
-
-    # Add REST API reference to the individual bug
-    if ($stash->{wants_ref} //= filter_wants_nocache($params, 'ref')) {
-        $data->{'ref'} = ref_urlbase() . "/bug/" . $bug->id;
+  my ($data, $bug, $stash) = @_;
+  my $dbh    = $stash->{dbh}    //= Bugzilla->dbh;
+  my $params = $stash->{params} //= Bugzilla->input_params;
+  my $rpc    = $stash->{rpc}    //= Bugzilla->request_cache->{bzapi_rpc};
+  my $method = $stash->{method} //= Bugzilla->request_cache->{bzapi_rpc_method};
+
+  $bug = ref $bug ? $bug : Bugzilla::Bug->check($bug || $data->{id});
+
+  # Add REST API reference to the individual bug
+  if ($stash->{wants_ref} //= filter_wants_nocache($params, 'ref')) {
+    $data->{'ref'} = ref_urlbase() . "/bug/" . $bug->id;
+  }
+
+  # User fields
+  foreach my $field (USER_FIELDS) {
+    next if !exists $data->{$field};
+    if ($field eq 'cc') {
+      my @new_cc;
+      foreach my $cc (@{$bug->cc_users}) {
+        my $cc_data = {name => filter_email($cc->email)};
+        push(@new_cc, fix_user($cc_data, $cc));
+      }
+      $data->{$field} = \@new_cc;
     }
-
-    # User fields
-    foreach my $field (USER_FIELDS) {
-        next if !exists $data->{$field};
-        if ($field eq 'cc') {
-            my @new_cc;
-            foreach my $cc (@{ $bug->cc_users }) {
-                my $cc_data = { name => filter_email($cc->email) };
-                push(@new_cc, fix_user($cc_data, $cc));
-            }
-            $data->{$field} = \@new_cc;
-        }
-        else {
-            my $field_name = $field;
-            if ($field eq 'creator') {
-                $field_name = 'reporter';
-            }
-            $data->{$field}
-              = fix_user($data->{"${field}_detail"}, $bug->$field_name);
-            delete $data->{$field}->{id};
-            delete $data->{$field}->{email};
-            $data->{$field} = filter($params, $data->{$field}, undef, $field);
-        }
-
-        # Get rid of extra detail hash if exists since redundant
-        delete $data->{"${field}_detail"} if exists $data->{"${field}_detail"};
+    else {
+      my $field_name = $field;
+      if ($field eq 'creator') {
+        $field_name = 'reporter';
+      }
+      $data->{$field} = fix_user($data->{"${field}_detail"}, $bug->$field_name);
+      delete $data->{$field}->{id};
+      delete $data->{$field}->{email};
+      $data->{$field} = filter($params, $data->{$field}, undef, $field);
     }
 
-    # Groups
-    if ($stash->{wants_groups} //= filter_wants_nocache($params, 'groups')) {
-        my @new_groups;
-        foreach my $group (@{ $data->{groups} }) {
-            if (my $object = Bugzilla::Group->new({ name => $group, cache => 1 })) {
-                $group = {
-                    id   => $rpc->type('int', $object->id),
-                    name => $rpc->type('string', $object->name),
-                };
-            }
-            push(@new_groups, $group);
-        }
-        $data->{groups} = \@new_groups;
+    # Get rid of extra detail hash if exists since redundant
+    delete $data->{"${field}_detail"} if exists $data->{"${field}_detail"};
+  }
+
+  # Groups
+  if ($stash->{wants_groups} //= filter_wants_nocache($params, 'groups')) {
+    my @new_groups;
+    foreach my $group (@{$data->{groups}}) {
+      if (my $object = Bugzilla::Group->new({name => $group, cache => 1})) {
+        $group = {
+          id   => $rpc->type('int',    $object->id),
+          name => $rpc->type('string', $object->name),
+        };
+      }
+      push(@new_groups, $group);
     }
-
-    # Flags
-    if (exists $data->{flags}) {
-        my @new_flags;
-        foreach my $flag (@{ $data->{flags} }) {
-            push(@new_flags, fix_flag($flag));
-        }
-        $data->{flags} = \@new_flags;
+    $data->{groups} = \@new_groups;
+  }
+
+  # Flags
+  if (exists $data->{flags}) {
+    my @new_flags;
+    foreach my $flag (@{$data->{flags}}) {
+      push(@new_flags, fix_flag($flag));
     }
-
-    # Attachment metadata is included by default but not data
-    if ($stash->{wants_attachments} //= filter_wants_nocache($params, 'attachments')) {
-        my $attachment_params = { ids => $bug->id };
-        if (!filter_wants_nocache($params, 'data', 'extra', 'attachments')
-            && !$params->{attachmentdata})
-        {
-            $attachment_params->{exclude_fields} = ['data'];
-        }
-
-        my $attachments = $rpc->attachments($attachment_params);
-
-        my @fixed_attachments;
-        foreach my $attachment (@{ $attachments->{bugs}->{$bug->id} }) {
-            my $fixed = fix_attachment($attachment);
-            push(@fixed_attachments, filter($params, $fixed, undef, 'attachments'));
-        }
-
-        $data->{attachments} = \@fixed_attachments;
+    $data->{flags} = \@new_flags;
+  }
+
+  # Attachment metadata is included by default but not data
+  if ($stash->{wants_attachments}
+    //= filter_wants_nocache($params, 'attachments'))
+  {
+    my $attachment_params = {ids => $bug->id};
+    if ( !filter_wants_nocache($params, 'data', 'extra', 'attachments')
+      && !$params->{attachmentdata})
+    {
+      $attachment_params->{exclude_fields} = ['data'];
     }
 
-    # Comments and history are not part of _default and have to be requested
+    my $attachments = $rpc->attachments($attachment_params);
 
-    # Comments
-    if ($stash->{wants_comments} //= filter_wants_nocache($params, 'comments', 'extra', 'comments')) {
-        my $comments = $rpc->comments({ ids => $bug->id });
-        $comments = $comments->{bugs}->{$bug->id}->{comments};
-        my @new_comments;
-        foreach my $comment (@$comments) {
-            $comment = fix_comment($comment);
-            push(@new_comments, filter($params, $comment, 'extra', 'comments'));
-        }
-        $data->{comments} = \@new_comments;
+    my @fixed_attachments;
+    foreach my $attachment (@{$attachments->{bugs}->{$bug->id}}) {
+      my $fixed = fix_attachment($attachment);
+      push(@fixed_attachments, filter($params, $fixed, undef, 'attachments'));
     }
 
-    # History
-    if ($stash->{wants_history} //= filter_wants_nocache($params, 'history', 'extra', 'history')) {
-        my $history = $rpc->history({ ids => [ $bug->id ] });
-        my @new_history;
-        foreach my $changeset (@{ $history->{bugs}->[0]->{history} }) {
-            push(@new_history, fix_changeset($changeset, $bug));
-        }
-        $data->{history} = \@new_history;
+    $data->{attachments} = \@fixed_attachments;
+  }
+
+  # Comments and history are not part of _default and have to be requested
+
+  # Comments
+  if ($stash->{wants_comments}
+    //= filter_wants_nocache($params, 'comments', 'extra', 'comments'))
+  {
+    my $comments = $rpc->comments({ids => $bug->id});
+    $comments = $comments->{bugs}->{$bug->id}->{comments};
+    my @new_comments;
+    foreach my $comment (@$comments) {
+      $comment = fix_comment($comment);
+      push(@new_comments, filter($params, $comment, 'extra', 'comments'));
+    }
+    $data->{comments} = \@new_comments;
+  }
+
+  # History
+  if ($stash->{wants_history}
+    //= filter_wants_nocache($params, 'history', 'extra', 'history'))
+  {
+    my $history = $rpc->history({ids => [$bug->id]});
+    my @new_history;
+    foreach my $changeset (@{$history->{bugs}->[0]->{history}}) {
+      push(@new_history, fix_changeset($changeset, $bug));
+    }
+    $data->{history} = \@new_history;
+  }
+
+  # Add in all custom fields even if not set or visible on this bug
+  my $custom_fields = $stash->{custom_fields}
+    //= Bugzilla->fields({custom => 1, obsolete => 0, by_name => 1});
+  foreach my $field (values %$custom_fields) {
+    my $name = $field->name;
+    my $type = $field->type;
+    if (!filter_wants_nocache($params, $name, ['default', 'custom'])) {
+      delete $custom_fields->{$name};
+      next;
+    }
+    if ($type == FIELD_TYPE_BUG_ID) {
+      $data->{$name} = $rpc->type('int', $bug->$name);
+    }
+    elsif ($type == FIELD_TYPE_DATETIME || $type == FIELD_TYPE_DATE) {
+      $data->{$name} = $rpc->type('dateTime', $bug->$name);
     }
+    elsif ($type == FIELD_TYPE_MULTI_SELECT) {
+
+# Bug.search, when include_fields=_all, returns array, otherwise return as comma delimited string :(
+      if ($method eq 'Bug.search'
+        && !grep($_ eq '_all', @{$params->{include_fields}}))
+      {
+        $data->{$name} = $rpc->type('string', join(', ', @{$bug->$name}));
+      }
+      else {
+        my @values = map { $rpc->type('string', $_) } @{$bug->$name};
+        $data->{$name} = \@values;
+      }
+    }
+    else {
+      $data->{$name} = $rpc->type('string', $bug->$name);
+    }
+  }
 
-    # Add in all custom fields even if not set or visible on this bug
-    my $custom_fields = $stash->{custom_fields} //=
-        Bugzilla->fields({ custom => 1, obsolete => 0, by_name => 1 });
-    foreach my $field (values %$custom_fields) {
-        my $name = $field->name;
-        my $type = $field->type;
-        if (!filter_wants_nocache($params, $name, ['default','custom'])) {
-            delete $custom_fields->{$name};
-            next;
-        }
-        if ($type == FIELD_TYPE_BUG_ID) {
-            $data->{$name} = $rpc->type('int', $bug->$name);
-        }
-        elsif ($type == FIELD_TYPE_DATETIME
-               || $type == FIELD_TYPE_DATE)
-        {
-            $data->{$name} = $rpc->type('dateTime', $bug->$name);
-        }
-        elsif ($type == FIELD_TYPE_MULTI_SELECT) {
-            # Bug.search, when include_fields=_all, returns array, otherwise return as comma delimited string :(
-            if ($method eq 'Bug.search' && !grep($_ eq '_all', @{ $params->{include_fields} })) {
-                $data->{$name} = $rpc->type('string', join(', ', @{ $bug->$name }));
-            }
-            else {
-                my @values = map { $rpc->type('string', $_) } @{ $bug->$name };
-                $data->{$name} = \@values;
-            }
-        }
-        else {
-            $data->{$name} = $rpc->type('string', $bug->$name);
-        }
+  # Remove empty values in some cases
+  foreach my $key (keys %$data) {
+
+    # QA Contact is null if single bug or "" if doing search
+    if ($key eq 'qa_contact' && !$data->{$key}->{name}) {
+      if ($method eq 'Bug.search') {
+        $data->{$key}->{name} = $rpc->type('string', '');
+      }
+      next;
     }
 
-    # Remove empty values in some cases
-    foreach my $key (keys %$data) {
-        # QA Contact is null if single bug or "" if doing search
-        if ($key eq 'qa_contact' && !$data->{$key}->{name}) {
-            if ($method eq 'Bug.search') {
-                $data->{$key}->{name} = $rpc->type('string', '');
-            }
-            next;
-        }
+    next if $method eq 'Bug.search' && $key eq 'url';    # Return url even if empty
+    next if $method eq 'Bug.search' && $key eq 'keywords'; # Return keywords even if empty
+    next if $method eq 'Bug.search' && $key eq 'whiteboard'; # Return whiteboard even if empty
+    next if $method eq 'Bug.get' && grep($_ eq $key, TIMETRACKING_FIELDS);
 
-        next if $method eq 'Bug.search' && $key eq 'url'; # Return url even if empty
-        next if $method eq 'Bug.search' && $key eq 'keywords'; # Return keywords even if empty
-        next if $method eq 'Bug.search' && $key eq 'whiteboard'; # Return whiteboard even if empty
-        next if $method eq 'Bug.get' && grep($_ eq $key, TIMETRACKING_FIELDS);
+    next
+      if ($method eq 'Bug.search'
+      && $key =~ /^(resolution|cc_count|dupe_count)$/
+      && !grep($_ eq '_all', @{$params->{include_fields}}));
 
-        next if ($method eq 'Bug.search'
-                 && $key =~ /^(resolution|cc_count|dupe_count)$/
-                 && !grep($_ eq '_all', @{ $params->{include_fields} }));
+    if (!ref $data->{$key}) {
+      delete $data->{$key} if !$data->{$key};
+    }
+    else {
+      if (ref $data->{$key} eq 'ARRAY' && !@{$data->{$key}}) {
 
-        if (!ref $data->{$key}) {
-            delete $data->{$key} if !$data->{$key};
+        # Return empty string if blocks or depends_on is empty
+        if ($method eq 'Bug.search' && ($key eq 'depends_on' || $key eq 'blocks')) {
+          $data->{$key} = '';
         }
         else {
-            if (ref $data->{$key} eq 'ARRAY' && !@{$data->{$key}}) {
-                # Return empty string if blocks or depends_on is empty
-                if ($method eq 'Bug.search' && ($key eq 'depends_on' || $key eq 'blocks')) {
-                    $data->{$key} = '';
-                }
-                else {
-                    delete $data->{$key};
-                }
-            }
-            elsif (ref $data->{$key} eq 'HASH' && !%{$data->{$key}}) {
-                delete $data->{$key};
-            }
+          delete $data->{$key};
         }
+      }
+      elsif (ref $data->{$key} eq 'HASH' && !%{$data->{$key}}) {
+        delete $data->{$key};
+      }
     }
+  }
 
-    return $data;
+  return $data;
 }
 
 # convert a user related field from being just login
 # names to user objects
 sub fix_user {
-    my ($data, $object) = @_;
-    my $user = Bugzilla->user;
-    my $rpc  = Bugzilla->request_cache->{bzapi_rpc};
+  my ($data, $object) = @_;
+  my $user = Bugzilla->user;
+  my $rpc  = Bugzilla->request_cache->{bzapi_rpc};
 
-    return { name => undef } if !$data;
+  return {name => undef} if !$data;
 
-    if (!ref $data) {
-        $data = {
-            name => filter_email($object->login)
-        };
-        $data->{real_name} = $rpc->type('string', $object->name);
-    }
-    else {
-        $data->{name} = filter_email($data->{name});
-    }
+  if (!ref $data) {
+    $data = {name => filter_email($object->login)};
+    $data->{real_name} = $rpc->type('string', $object->name);
+  }
+  else {
+    $data->{name} = filter_email($data->{name});
+  }
 
-    if ($user->id) {
-        $data->{ref} = $rpc->type('string', ref_urlbase . "/user/" . $object->login);
-    }
+  if ($user->id) {
+    $data->{ref} = $rpc->type('string', ref_urlbase . "/user/" . $object->login);
+  }
 
-    return $data;
+  return $data;
 }
 
 # convert certain attributes of a comment to objects
 # and also remove other unwanted key/values.
 sub fix_comment {
-    my ($data, $object) = @_;
-    my $rpc = Bugzilla->request_cache->{bzapi_rpc};
-    my $method = Bugzilla->request_cache->{bzapi_rpc_method};
+  my ($data, $object) = @_;
+  my $rpc    = Bugzilla->request_cache->{bzapi_rpc};
+  my $method = Bugzilla->request_cache->{bzapi_rpc_method};
 
-    $object ||= Bugzilla::Comment->new({ id => $data->{id}, cache => 1 });
+  $object ||= Bugzilla::Comment->new({id => $data->{id}, cache => 1});
 
-    if (exists $data->{creator}) {
-        $data->{creator} = fix_user($data->{creator}, $object->author);
-    }
+  if (exists $data->{creator}) {
+    $data->{creator} = fix_user($data->{creator}, $object->author);
+  }
 
-    if ($data->{attachment_id} && $method ne 'Bug.search') {
-        $data->{attachment_ref} = $rpc->type('string', ref_urlbase() .
-                                             "/attachment/" . $object->extra_data);
-    }
-    else {
-        delete $data->{attachment_id};
-    }
+  if ($data->{attachment_id} && $method ne 'Bug.search') {
+    $data->{attachment_ref}
+      = $rpc->type('string', ref_urlbase() . "/attachment/" . $object->extra_data);
+  }
+  else {
+    delete $data->{attachment_id};
+  }
 
-    delete $data->{author};
-    delete $data->{time};
-    delete $data->{raw_text};
+  delete $data->{author};
+  delete $data->{time};
+  delete $data->{raw_text};
 
-    return $data;
+  return $data;
 }
 
 # convert certain attributes of a changeset object from
 # scalar values to related objects. Also remove other unwanted
 # key/values.
 sub fix_changeset {
-    my ($data, $object) = @_;
-    my $user = Bugzilla->user;
-    my $rpc  = Bugzilla->request_cache->{bzapi_rpc};
-
-    if ($data->{who}) {
-        $data->{changer} = {
-            name => $rpc->type('string', $data->{who}),
-            ref  => $rpc->type('string', ref_urlbase() . "/user/" . $data->{who})
-        };
-        delete $data->{who};
-    }
-
-    if ($data->{when}) {
-        $data->{change_time} = $rpc->type('dateTime', $data->{when});
-        delete $data->{when};
-    }
-
-    foreach my $change (@{ $data->{changes} }) {
-        $change->{field_name} = 'flag' if $change->{field_name} eq 'flagtypes.name';
-    }
-
-    return $data;
+  my ($data, $object) = @_;
+  my $user = Bugzilla->user;
+  my $rpc  = Bugzilla->request_cache->{bzapi_rpc};
+
+  if ($data->{who}) {
+    $data->{changer} = {
+      name => $rpc->type('string', $data->{who}),
+      ref  => $rpc->type('string', ref_urlbase() . "/user/" . $data->{who})
+    };
+    delete $data->{who};
+  }
+
+  if ($data->{when}) {
+    $data->{change_time} = $rpc->type('dateTime', $data->{when});
+    delete $data->{when};
+  }
+
+  foreach my $change (@{$data->{changes}}) {
+    $change->{field_name} = 'flag' if $change->{field_name} eq 'flagtypes.name';
+  }
+
+  return $data;
 }
 
 # convert certain attributes of an attachment object from
 # scalar values to related objects. Also add in additional
 # key/values.
 sub fix_attachment {
-    my ($data, $object) = @_;
-    my $rpc    = Bugzilla->request_cache->{bzapi_rpc};
-    my $method = Bugzilla->request_cache->{bzapi_rpc_method};
-    my $params = Bugzilla->input_params;
-    my $user   = Bugzilla->user;
-
-    $object ||= Bugzilla::Attachment->new({ id => $data->{id}, cache => 1 });
-
-    if (exists $data->{attacher}) {
-        $data->{attacher} = fix_user($data->{attacher}, $object->attacher);
-        if ($method eq 'Bug.search') {
-            delete $data->{attacher}->{real_name};
-        }
-        else {
-            $data->{attacher}->{real_name} = $rpc->type('string', $object->attacher->name);
-        }
+  my ($data, $object) = @_;
+  my $rpc    = Bugzilla->request_cache->{bzapi_rpc};
+  my $method = Bugzilla->request_cache->{bzapi_rpc_method};
+  my $params = Bugzilla->input_params;
+  my $user   = Bugzilla->user;
+
+  $object ||= Bugzilla::Attachment->new({id => $data->{id}, cache => 1});
+
+  if (exists $data->{attacher}) {
+    $data->{attacher} = fix_user($data->{attacher}, $object->attacher);
+    if ($method eq 'Bug.search') {
+      delete $data->{attacher}->{real_name};
     }
-
-    if (exists $data->{data}) {
-        $data->{encoding} = $rpc->type('string', 'base64');
-        if ($params->{attachmentdata}
-            || filter_wants_nocache($params, 'attachments.data'))
-        {
-            $data->{encoding} = $rpc->type('string', 'base64');
-        }
-        else {
-            delete $data->{data};
-        }
-    }
-
-    if (exists $data->{bug_id}) {
-        $data->{bug_ref} = $rpc->type('string', ref_urlbase() . "/bug/" . $object->bug_id);
-    }
-
-    # Upstream API returns these as integers where bzapi returns as booleans
-    if (exists $data->{is_patch}) {
-        $data->{is_patch} = $rpc->type('boolean', $data->{is_patch});
-    }
-    if (exists $data->{is_obsolete}) {
-        $data->{is_obsolete} = $rpc->type('boolean', $data->{is_obsolete});
-    }
-    if (exists $data->{is_private}) {
-        $data->{is_private} = $rpc->type('boolean', $data->{is_private});
+    else {
+      $data->{attacher}->{real_name} = $rpc->type('string', $object->attacher->name);
     }
-
-    if (exists $data->{flags} && @{ $data->{flags} }) {
-        my @new_flags;
-        foreach my $flag (@{ $data->{flags} }) {
-            push(@new_flags, fix_flag($flag));
-        }
-        $data->{flags} = \@new_flags;
+  }
+
+  if (exists $data->{data}) {
+    $data->{encoding} = $rpc->type('string', 'base64');
+    if ($params->{attachmentdata}
+      || filter_wants_nocache($params, 'attachments.data'))
+    {
+      $data->{encoding} = $rpc->type('string', 'base64');
     }
     else {
-        delete $data->{flags};
+      delete $data->{data};
     }
+  }
+
+  if (exists $data->{bug_id}) {
+    $data->{bug_ref}
+      = $rpc->type('string', ref_urlbase() . "/bug/" . $object->bug_id);
+  }
+
+  # Upstream API returns these as integers where bzapi returns as booleans
+  if (exists $data->{is_patch}) {
+    $data->{is_patch} = $rpc->type('boolean', $data->{is_patch});
+  }
+  if (exists $data->{is_obsolete}) {
+    $data->{is_obsolete} = $rpc->type('boolean', $data->{is_obsolete});
+  }
+  if (exists $data->{is_private}) {
+    $data->{is_private} = $rpc->type('boolean', $data->{is_private});
+  }
+
+  if (exists $data->{flags} && @{$data->{flags}}) {
+    my @new_flags;
+    foreach my $flag (@{$data->{flags}}) {
+      push(@new_flags, fix_flag($flag));
+    }
+    $data->{flags} = \@new_flags;
+  }
+  else {
+    delete $data->{flags};
+  }
 
-    $data->{ref} = $rpc->type('string', ref_urlbase() . "/attachment/" . $object->id);
+  $data->{ref}
+    = $rpc->type('string', ref_urlbase() . "/attachment/" . $object->id);
 
-    # Add update token if we are getting an attachment outside of Bug.get and user is logged in
-    if ($user->id && ($method eq 'Bug.attachments'|| $method eq 'Bug.search')) {
-        $data->{update_token} = issue_hash_token([ $object->id, $object->modification_time ]);
-    }
+# Add update token if we are getting an attachment outside of Bug.get and user is logged in
+  if ($user->id && ($method eq 'Bug.attachments' || $method eq 'Bug.search')) {
+    $data->{update_token}
+      = issue_hash_token([$object->id, $object->modification_time]);
+  }
 
-    delete $data->{creator};
-    delete $data->{summary};
+  delete $data->{creator};
+  delete $data->{summary};
 
-    return $data;
+  return $data;
 }
 
 # convert certain attributes of a flag object from
 # scalar values to related objects. Also remove other unwanted
 # key/values.
 sub fix_flag {
-    my ($data, $object) = @_;
-    my $rpc = Bugzilla->request_cache->{bzapi_rpc};
+  my ($data, $object) = @_;
+  my $rpc = Bugzilla->request_cache->{bzapi_rpc};
 
-    $object ||= Bugzilla::Flag->new({ id => $data->{id}, cache => 1 });
+  $object ||= Bugzilla::Flag->new({id => $data->{id}, cache => 1});
 
-    if (exists $data->{setter}) {
-        $data->{setter} = fix_user($data->{setter}, $object->setter);
-        delete $data->{setter}->{real_name};
-    }
+  if (exists $data->{setter}) {
+    $data->{setter} = fix_user($data->{setter}, $object->setter);
+    delete $data->{setter}->{real_name};
+  }
 
-    if (exists $data->{requestee}) {
-        $data->{requestee} = fix_user($data->{requestee}, $object->requestee);
-        delete $data->{requestee}->{real_name};
-    }
+  if (exists $data->{requestee}) {
+    $data->{requestee} = fix_user($data->{requestee}, $object->requestee);
+    delete $data->{requestee}->{real_name};
+  }
 
-    return $data;
+  return $data;
 }
 
 # Calls Bugzilla::WebService::Util::filter_wants but disables caching
 # as we make several webservice calls in a single REST call and the
 # caching can cause unexpected results.
 sub filter_wants_nocache {
-    my ($params, $field, $types, $prefix) = @_;
-    delete Bugzilla->request_cache->{filter_wants};
-    return filter_wants($params, $field, $types, $prefix);
+  my ($params, $field, $types, $prefix) = @_;
+  delete Bugzilla->request_cache->{filter_wants};
+  return filter_wants($params, $field, $types, $prefix);
 }
 
 sub filter {
-    my ($params, $hash, $types, $prefix) = @_;
-    my %newhash = %$hash;
-    foreach my $key (keys %$hash) {
-        delete $newhash{$key} if !filter_wants_nocache($params, $key, $types, $prefix);
-    }
-    return \%newhash;
+  my ($params, $hash, $types, $prefix) = @_;
+  my %newhash = %$hash;
+  foreach my $key (keys %$hash) {
+    delete $newhash{$key} if !filter_wants_nocache($params, $key, $types, $prefix);
+  }
+  return \%newhash;
 }
 
 sub fix_credentials {
-    my ($params) = @_;
-    # Allow user to pass in username=foo&password=bar to be compatible
-    $params->{'Bugzilla_login'} = $params->{'login'} = delete $params->{'username'}
-      if exists $params->{'username'};
-    $params->{'Bugzilla_password'} = $params->{'password'} if exists $params->{'password'};
-
-    # Allow user to pass userid=1&cookie=3iYGuKZdyz for compatibility with BzAPI
-    if (exists $params->{'userid'} && exists $params->{'cookie'}) {
-        my $userid = delete $params->{'userid'};
-        my $cookie = delete $params->{'cookie'};
-        $params->{'Bugzilla_token'} = "${userid}-${cookie}";
-    }
+  my ($params) = @_;
+
+  # Allow user to pass in username=foo&password=bar to be compatible
+  $params->{'Bugzilla_login'} = $params->{'login'} = delete $params->{'username'}
+    if exists $params->{'username'};
+  $params->{'Bugzilla_password'} = $params->{'password'}
+    if exists $params->{'password'};
+
+  # Allow user to pass userid=1&cookie=3iYGuKZdyz for compatibility with BzAPI
+  if (exists $params->{'userid'} && exists $params->{'cookie'}) {
+    my $userid = delete $params->{'userid'};
+    my $cookie = delete $params->{'cookie'};
+    $params->{'Bugzilla_token'} = "${userid}-${cookie}";
+  }
 }
 
 # Filter email addresses by default ignoring the system
 # webservice_email_filter setting
 sub filter_email {
-    my $rpc = Bugzilla->request_cache->{bzapi_rpc};
-    return $rpc->type('string', email_filter($_[0]));
+  my $rpc = Bugzilla->request_cache->{bzapi_rpc};
+  return $rpc->type('string', email_filter($_[0]));
 }
 
 1;
-- 
cgit v1.2.3-24-g4f1b