This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / httemplate / misc / unprovision.cgi

diff --git a/httemplate/misc/unprovision.cgi b/httemplate/misc/unprovision.cgi
index 6f2c238..4ab15fd 100755 (executable)
--- a/httemplate/misc/unprovision.cgi
+++ b/httemplate/misc/unprovision.cgi
@@ -1,8 +1,6 @@
 %if ( $error ) {
 %  errorpage($error);
-%} elsif ( $pkgnum ) {
-<% $cgi->redirect(popurl(2)."search/cust_pkg_svc.html?svcpart=$svcpart;pkgnum=$pkgnum") %>
-%} else { # $custnum should always exist
+%} else {
 <% $cgi->redirect(popurl(2)."view/cust_main.cgi?$custnum") %>
 %}
 <%init>
@@ -11,28 +9,18 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Unprovision customer service');
 
 #untaint svcnum
-my @svcnums;
-my ($pkgnum, $svcpart, $custnum);
-if( $cgi->param('svcnum') ) {
-  @svcnums = grep { $_ } map { /^(\d+)$/ && $1 } $cgi->param('svcnum');
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
-  $custnum = $cgi->param('custnum');
-}
-else {
-  @svcnums = map { /^(\d+)$/ && $1 } $cgi->keywords;
-}
+my($query) = $cgi->keywords;
+$query =~ /^(\d+)$/;
+my $svcnum = $1;
 
-my $error = '';
-foreach my $svcnum (@svcnums) {
+#my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+#die "Unknown svcnum!" unless $svc_acct;
 
-  my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-  die "Unknown svcnum!" unless $cust_svc;
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+die "Unknown svcnum!" unless $cust_svc;
 
-  $custnum ||= $cust_svc->cust_pkg->custnum;
+my $custnum = $cust_svc->cust_pkg->custnum;
 
-  $error .= $cust_svc->cancel;
-
-}
+my $error = $cust_svc->cancel;
 
 </%init>