X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig-delete.cgi;h=a05cb1e14f653c118a2145abfd5800430b5f0d74;hb=1958c28884c750ca37979f19bec3e3daf0386731;hp=cdac434fa539850733e602c49a77c55d965774c3;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;p=freeside.git

diff --git a/httemplate/config/config-delete.cgi b/httemplate/config/config-delete.cgi
index cdac434fa..a05cb1e14 100644
--- a/httemplate/config/config-delete.cgi
+++ b/httemplate/config/config-delete.cgi
@@ -2,14 +2,21 @@
 die "access denied\n"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-die "No configuration item specified (bad URL)!" unless $cgi->keywords;
-my ($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
+$cgi->param('confnum') =~ /^(\d+)$/ or die "illegal or missing confnum";
 my $confnum = $1;
 
 my $conf = qsearchs('conf', {'confnum' => $confnum});
 die "Configuration not found!" unless $conf;
 $conf->delete;
 
+my $redirect = popurl(2);
+if ( $cgi->param('redirect') eq 'config_view_showagent' ) {
+  $redirect .= 'config/config-view.cgi?showagent=1#'. $conf->name;
+} elsif ( $cgi->param('redirect') eq 'config_view' ) {
+  $redirect .= 'config/config-view.cgi';
+} else {
+  $redirect .= 'browse/agent.cgi';
+}
+
 </%init>
-<% $cgi->redirect(popurl(2) . "browse/agent.cgi") %>
+<% $cgi->redirect($redirect) %>