Will things ever be the same again?

[freeside.git] / httemplate / misc / cancel-unaudited.cgi

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 8f31db8..6f070a4 100755 (executable)
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -1,44 +1,36 @@
-<%
+%
+%
+%my $dbh = dbh;
+% 
+%#untaint svcnum
+%my($query) = $cgi->keywords;
+%$query =~ /^(\d+)$/;
+%my $svcnum = $1;
+%
+%#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_pkg = $cust_svc->cust_pkg;
+%if ( $cust_pkg ) {
+%  &eidiot( 'This account has already been audited.  Cancel the '.
+%           qq!<A HREF="${p}view/cust_main.cgi?!. $cust_pkg->custnum.
+%           '#cust_pkg'. $cust_pkg->pkgnum. '">'.
+%           'package</A> instead.');
+%}
+%
+%my $error = $cust_svc->cancel;
+%
+%if ( $error ) {
+%  
 
-my $dbh = dbh;
- 
-#untaint svcnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
-
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $svc_acct;
-
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-&eidiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-    qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
-
-my $error = $svc_acct->cancel;
-$error ||= $svc_acct->delete;
-$error ||= $cust_svc->delete;
-
-if ( $error ) {
-  $dbh->rollback;
-  %>
 <!-- mason kludge -->
-<%
-  &eidiot(@_);
-} else {
-
-  $dbh->commit or die $dbh->errstr;
-
-  print $cgi->redirect(popurl(2));
-}
+%
+%  &eidiot($error);
+%} else {
+%  print $cgi->redirect(popurl(2));
+%}
+%
+%
 
-%>