remove

  use Module;
and
  $cgi = new CGI;
  &cgisuidsetup();
from all templates.  should work better under Mason.

11 files changed, 20 insertions, 161 deletions

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 62004490f..067a06b30 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,15 +1,5 @@
+<!-- $Id: agent.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $ui $cgi $p $agent );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::agent;
-use FS::agent_type;
 
 #Begin silliness
 #
@@ -22,12 +12,6 @@ use FS::agent_type;
 #__END__
 #End silliness
 
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
 print header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
@@ -47,7 +31,7 @@ END
 #        <TH><FONT SIZE=-1>Agent #</FONT></TH>
 #        <TH>Agent</TH>
 
-foreach $agent ( sort { 
+foreach my $agent ( sort { 
   $a->getfield('agentnum') <=> $b->getfield('agentnum')
 } qsearch('agent',{}) ) {
   my($hashref)=$agent->hashref;
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index 11ba20ac5..8321048e7 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,22 +1,6 @@
+<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $p $agent_type );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 print header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
@@ -27,7 +11,7 @@ print header("Agent Type Listing", menubar(
       </TR>
 END
 
-foreach $agent_type ( sort { 
+foreach my $agent_type ( sort { 
   $a->getfield('typenum') <=> $b->getfield('typenum')
 } qsearch('agent_type',{}) ) {
   my($hashref)=$agent_type->hashref;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index bbd75cc4a..89b1bfd71 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,20 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $cust_main_county );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 7779bd0c3..960843adf 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,21 +1,5 @@
+<!-- $Id: cust_pay_batch.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay_batch.cgi,v 1.1 2001-10-30 19:05:27 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p ); # $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::queue;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Pending credit card batch", menubar(
   'Main Menu' => $p,
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 6df40e049..b392dc083 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -1,22 +1,6 @@
+<!-- $Id -->
 <%
 
-use strict;
-use vars qw( $cgi $p );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch); # qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::nas;
-use FS::port;
-use FS::session;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$p=popurl(2);
-
 print header('NAS ports', menubar(
   'Main Menu' => $p,
 ));
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index f33997666..cd90bc1da 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_bill_event.cgi,v 1.1 2002-01-29 16:33:15 ivan Exp $ -->
+<!-- $Id: part_bill_event.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
 
 my %search;
@@ -22,7 +22,7 @@ my $total = scalar(@part_bill_event);
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled events</a> )'; }
 %>
-<TABLE BORDER=1>
+<%= table() %>
   <TR>
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Event</TH>
     <TH>Payby</TH>
@@ -32,11 +32,12 @@ my $total = scalar(@part_bill_event);
 
 <% foreach my $part_bill_event ( sort {    $a->payby     cmp $b->payby
                                         || $a->seconds   <=> $b->seconds
+                                        || $a->weight    <=> $b->weight
                                         || $a->eventpart <=> $b->eventpart
                                       } @part_bill_event ) {
      my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart;
      use Time::Duration;
-     my $delay = duration_exact($hashref->{seconds});
+     my $delay = duration_exact($part_bill_event->seconds);
 %>
   <TR>
     <TD><A HREF="<%= $url %>">
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index d0b572aa4..22d139c99 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,22 +1,5 @@
+<!-- $Id: part_pkg.cgi,v 1.10 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: part_pkg.cgi,v 1.9 2001-12-27 09:26:14 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl table);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::part_svc;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 my %search;
 if ( $cgi->param('showdisabled') ) {
@@ -56,7 +39,7 @@ print &table(), <<END;
       </TR>
 END
 
-foreach $part_pkg ( sort { 
+foreach my $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } @part_pkg ) {
   my($hashref)=$part_pkg->hashref;
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index b82d4cba0..82f42924f 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,20 +1,5 @@
+<!-- $Id: part_referral.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::part_referral;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Referral Listing", menubar(
   'Main Menu' => $p,
@@ -25,7 +10,7 @@ print header("Referral Listing", menubar(
       </TR>
 END
 
-foreach $part_referral ( sort { 
+foreach my $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
   my($hashref)=$part_referral->hashref;
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index da523ca51..54d4b083b 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: part_svc.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
+<!-- $Id: part_svc.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
 
 my %search;
@@ -22,7 +22,7 @@ my $total = scalar(@part_svc);
       : do { $cgi->param('showdisabled', 1);
              '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; }
 %>
-<TABLE BORDER=1>
+<%= table() %>
   <TR>
     <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH>
     <TH>Table</TH>
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 6b5237240..af8989b82 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,21 +1,5 @@
+<!-- $Id: queue.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: queue.cgi,v 1.6 2001-10-31 16:52:42 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p ); # $part_referral );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch);
-use FS::CGI qw(header menubar popurl table);
-use FS::queue;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header("Job Queue", menubar(
   'Main Menu' => $p,
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 21cb95f89..a881b9a00 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,20 +1,5 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $p $svc_acct_pop );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar table popurl);
-use FS::svc_acct_pop;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
 
 print header('POP Listing', menubar(
   'Main Menu' => $p,
@@ -29,7 +14,7 @@ print header('POP Listing', menubar(
       </TR>
 END
 
-foreach $svc_acct_pop ( sort { 
+foreach my $svc_acct_pop ( sort { 
   #$a->getfield('popnum') <=> $b->getfield('popnum')
   $a->state cmp $b->state || $a->city cmp $b->city
     || $a->ac <=> $b->ac || $a->exch <=> $b->exch || $a->loc <=> $b->loc