optimize CDR rating after timed rate perf regression, RT#15739

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

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 11cde96..4919c66 100755 (executable)
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -1,7 +1,15 @@
-<%
+%if ( $error ) {
+%  errorpage($error);
+%} else {
+<% $cgi->redirect(popurl(2)) %>
+%}
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Unprovision customer service')
+      && $FS::CurrentUser::CurrentUser->access_right('View/link unlinked services');
 
-my $dbh = dbh;
- 
 #untaint svcnum
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
@@ -12,20 +20,14 @@ my $svcnum = $1;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $cust_svc;
-&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';
+my $cust_pkg = $cust_svc->cust_pkg;
+if ( $cust_pkg ) {
+  errorpage( '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 ) {
-  %>
-<!-- mason kludge -->
-<%
-  &eidiot($error);
-} else {
-  print $cgi->redirect(popurl(2));
-}
-
-%>
+</%init>