1 files changed, 75 insertions, 77 deletions
diff --git a/editkeywords.cgi b/editkeywords.cgi
index 6c5a68e68..571e7412d 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -19,10 +19,10 @@ use Bugzilla::Error;
 use Bugzilla::Keyword;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 #
 # Preliminary checks:
@@ -33,11 +33,10 @@ my $user = Bugzilla->login(LOGIN_REQUIRED);
 print $cgi->header();
 
 $user->in_group('editkeywords')
-  || ThrowUserError("auth_failure", {group  => "editkeywords",
-                                     action => "edit",
-                                     object => "keywords"});
+  || ThrowUserError("auth_failure",
+  {group => "editkeywords", action => "edit", object => "keywords"});
 
-my $action = trim($cgi->param('action')  || '');
+my $action = trim($cgi->param('action') || '');
 my $key_id = $cgi->param('id');
 my $token  = $cgi->param('token');
 
@@ -45,50 +44,49 @@ $vars->{'action'} = $action;
 
 
 if ($action eq "") {
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    print $cgi->header();
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_keyword');
+  $vars->{'token'} = issue_session_token('add_keyword');
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $template->process("admin/keywords/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $template->process("admin/keywords/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 #
 # action='new' -> add keyword entered in the 'action=add' screen
 #
 if ($action eq 'new') {
-    check_token_data($token, 'add_keyword');
-    my $name      = $cgi->param('name') || '';
-    my $is_active = $cgi->param('is_active');
-    my $desc      = $cgi->param('description')  || '';
+  check_token_data($token, 'add_keyword');
+  my $name      = $cgi->param('name') || '';
+  my $is_active = $cgi->param('is_active');
+  my $desc      = $cgi->param('description') || '';
 
-    my $keyword = Bugzilla::Keyword->create(
-        { name => $name, description => $desc });
+  my $keyword = Bugzilla::Keyword->create({name => $name, description => $desc});
 
-    delete_token($token);
+  delete_token($token);
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $vars->{'message'} = 'keyword_created';
-    $vars->{'name'} = $keyword->name;
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+  $vars->{'message'}  = 'keyword_created';
+  $vars->{'name'}     = $keyword->name;
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 
@@ -99,16 +97,16 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'edit') {
-    my $keyword = new Bugzilla::Keyword($key_id)
-        || ThrowCodeError('invalid_keyword_id', { id => $key_id });
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowCodeError('invalid_keyword_id', {id => $key_id});
 
-    $vars->{'keyword'} = $keyword;
-    $vars->{'token'} = issue_session_token('edit_keyword');
+  $vars->{'keyword'} = $keyword;
+  $vars->{'token'}   = issue_session_token('edit_keyword');
 
-    print $cgi->header();
-    $template->process("admin/keywords/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  print $cgi->header();
+  $template->process("admin/keywords/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 
@@ -117,62 +115,62 @@ if ($action eq 'edit') {
 #
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_keyword');
-    my $keyword = new Bugzilla::Keyword($key_id)
-        || ThrowCodeError('invalid_keyword_id', { id => $key_id });
+  check_token_data($token, 'edit_keyword');
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowCodeError('invalid_keyword_id', {id => $key_id});
 
-    $keyword->set_all({
-        name        => scalar $cgi->param('name'),
-        description => scalar $cgi->param('description'),
-        is_active   => scalar $cgi->param('is_active'),
-    });
-    my $changes = $keyword->update();
+  $keyword->set_all({
+    name        => scalar $cgi->param('name'),
+    description => scalar $cgi->param('description'),
+    is_active   => scalar $cgi->param('is_active'),
+  });
+  my $changes = $keyword->update();
 
-    delete_token($token);
+  delete_token($token);
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $vars->{'message'} = 'keyword_updated';
-    $vars->{'keyword'} = $keyword;
-    $vars->{'changes'} = $changes;
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+  $vars->{'message'}  = 'keyword_updated';
+  $vars->{'keyword'}  = $keyword;
+  $vars->{'changes'}  = $changes;
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'del') {
-    my $keyword =  new Bugzilla::Keyword($key_id)
-        || ThrowCodeError('invalid_keyword_id', { id => $key_id });
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowCodeError('invalid_keyword_id', {id => $key_id});
 
-    $vars->{'keyword'} = $keyword;
-    $vars->{'token'} = issue_session_token('delete_keyword');
+  $vars->{'keyword'} = $keyword;
+  $vars->{'token'}   = issue_session_token('delete_keyword');
 
-    print $cgi->header();
-    $template->process("admin/keywords/confirm-delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  print $cgi->header();
+  $template->process("admin/keywords/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_keyword');
-    my $keyword =  new Bugzilla::Keyword($key_id)
-        || ThrowCodeError('invalid_keyword_id', { id => $key_id });
+  check_token_data($token, 'delete_keyword');
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowCodeError('invalid_keyword_id', {id => $key_id});
 
-    $keyword->remove_from_db();
+  $keyword->remove_from_db();
 
-    delete_token($token);
+  delete_token($token);
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $vars->{'message'} = 'keyword_deleted';
-    $vars->{'keyword'} = $keyword;
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+  $vars->{'message'}  = 'keyword_deleted';
+  $vars->{'keyword'}  = $keyword;
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 ThrowUserError('unknown_action', {action => $action});