From afe02a6edbc84062347813aba15f80623472f7a9 Mon Sep 17 00:00:00 2001 From: "jocuri%softhome.net" <> Date: Fri, 21 Nov 2003 18:00:51 +0000 Subject: Bug 225703: Partial templatization for editkeywords.cgi; r=jouni; r=gerv; a=justdave. --- editkeywords.cgi | 88 +++++++++++++++++++++----------------------------------- 1 file changed, 33 insertions(+), 55 deletions(-) (limited to 'editkeywords.cgi') diff --git a/editkeywords.cgi b/editkeywords.cgi index 7af0c1a6c..cf2c44efc 100755 --- a/editkeywords.cgi +++ b/editkeywords.cgi @@ -25,6 +25,8 @@ use lib "."; require "CGI.pl"; +use vars qw($template $vars); + my $localtrailer = "edit more keywords"; @@ -126,6 +128,8 @@ unless (UserInGroup("editkeywords")) { my $action = trim($::FORM{action} || ''); +$vars->{'action'} = $action; + detaint_natural($::FORM{id}); @@ -180,20 +184,12 @@ if ($action eq "") { if ($action eq 'add') { - PutHeader("Add keyword"); - print "
"; - - my $other = $localtrailer; - $other =~ s/more/other/; - PutTrailer($other); exit; } @@ -308,8 +304,6 @@ if ($action eq 'edit') { # if ($action eq 'update') { - PutHeader("Update keyword"); - my $id = $::FORM{id}; my $name = trim($::FORM{name} || ''); my $description = trim($::FORM{description} || ''); @@ -321,6 +315,8 @@ if ($action eq 'update') { my $tmp = FetchOneColumn(); if ($tmp && $tmp != $id) { + PutHeader("Update keyword"); + print "The keyword '$name' already exists. Please press\n"; print "Back and try again.\n"; PutTrailer($localtrailer); @@ -331,26 +327,27 @@ if ($action eq 'update') { ", description = " . SqlQuote($description) . " WHERE id = $id"); - print "Keyword updated.$name
keyword?
-
-
-};
+ $vars->{'bug_count'} = $bugs;
+ $vars->{'keyword_id'} = $id;
+ $vars->{'name'} = $name;
+
+ print Bugzilla->cgi->header();
+
+ $template->process("admin/keywords/confirm-delete.html.tmpl",
+ $vars)
+ || ThrowTemplateError($template->error());
- PutTrailer($localtrailer);
exit;
}
}
@@ -380,31 +372,17 @@ to delete the $name
keyword?
SendSQL("DELETE FROM keywords WHERE keywordid = $id");
SendSQL("DELETE FROM keyworddefs WHERE id = $id");
- print "Keyword $name deleted.\n";
-
- &RebuildCacheWarning;
# Make versioncache flush
unlink "data/versioncache";
- PutTrailer($localtrailer);
- exit;
-}
-
-PutHeader("Error");
-print "I don't have a clue what you want.