*finally* seems to be working under Mason. sheesh.

[freeside.git] / httemplate / search / cust_pkg.cgi

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 137dc5f..54e02ce 100755 (executable)
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,38 +1,21 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.11 2001-12-18 07:08:16 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg
-              $conf $maxrecords $limit $offset );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(dbh cgisuidsetup);
-use FS::Conf;
-use FS::Record qw(qsearch qsearchs dbdef);
-use FS::CGI qw(header eidiot popurl table);
-use FS::cust_pkg;
-use FS::pkg_svc;
-use FS::cust_svc;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$maxrecords = $conf->config('maxsearchrecordsperpage');
+my $conf = new FS::Conf;
+my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
 my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
 
-$limit = '';
+my $limit = '';
 $limit .= "LIMIT $maxrecords" if $maxrecords;
 
-$offset = $cgi->param('offset') || 0;
+my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
 my $total;
 
 my $unconf = '';
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
+my $sortby;
 if ( $query eq 'pkgnum' ) {
   $sortby=\*pkgnum_sort;
 
@@ -86,16 +69,22 @@ $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
 
 $total = $sth->fetchrow_arrayref->[0];
 
-@cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+my @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
 
 
 if ( scalar(@cust_pkg) == 1 ) {
   my($pkgnum)=$cust_pkg[0]->pkgnum;
   print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
-  exit;
+  #exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
+%>
+<!-- mason kludge -->
+<%
   eidiot("No packages found");
 } else {
+%>
+<!-- mason kludge -->
+<%
   $total ||= scalar(@cust_pkg);
 
   #begin pager
@@ -158,23 +147,22 @@ END
   ) {
     my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
     my($pkgnum, $setup, $bill, $susp, $expire, $cancel,
-       $custnum, $last, $first, $company
-    ) = (
+       $custnum, $last, $first, $company ) = (
       $cust_pkg->pkgnum,
       $cust_pkg->getfield('setup')
         ? time2str("%D", $cust_pkg->getfield('setup') )
         : '',
       $cust_pkg->getfield('bill')
-        ? time2str("%D", $cust_pkg->getfield('bill') ),
+        ? time2str("%D", $cust_pkg->getfield('bill') )
         : '',
       $cust_pkg->getfield('susp')
-        ? time2str("%D", $cust_pkg->getfield('susp') ),
+        ? time2str("%D", $cust_pkg->getfield('susp') )
         : '',
       $cust_pkg->getfield('expire')
-        ? time2str("%D", $cust_pkg->getfield('expire') ),
+        ? time2str("%D", $cust_pkg->getfield('expire') )
         : '',
       $cust_pkg->getfield('cancel')
-        ? time2str("%D", $cust_pkg->getfield('cancel') ),
+        ? time2str("%D", $cust_pkg->getfield('cancel') )
         : '',
       $cust_pkg->custnum,
       $cust_main ? $cust_main->last : '',