remove

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

2 files changed, 73 insertions, 13 deletions

diff --git a/htetc/global.asa b/htetc/global.asa
index 20ef1467d..c4b4380d6 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -2,19 +2,49 @@ use strict;
 use vars qw( $cgi $p );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
-use HTML::Entities;
 use Date::Format;
 use Date::Parse;
 use Tie::IxHash;
-use FS::UID qw(cgisuidsetup dbh);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_svc;
-use FS::part_pkg;
-use FS::pkg_svc;
+use HTML::Entities;
+use IO::Handle;
+use IO::File;
+use String::Approx qw(amatch);
+use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+use FS::Record qw(qsearch qsearchs fields dbdef);
+use FS::Conf;
+use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
+               small_custview);
+
+use FS::agent;
+use FS::agent_type;
+use FS::domain_record;
+use FS::cust_bill;
+use FS::cust_bill_pay;
+use FS::cust_credit;
+use FS::cust_credit_bill;
+use FS::cust_main;
+use FS::cust_main_county;
+use FS::cust_pay;
 use FS::cust_pkg;
+use FS::cust_refund;
 use FS::cust_svc;
+use FS::nas;
 use FS::part_bill_event;
-use FS::CGI qw(header menubar popurl table itable ntable);
+use FS::part_pkg;
+use FS::part_referral;
+use FS::part_svc;
+use FS::pkg_svc;
+use FS::port;
+use FS::queue;
+use FS::raddb;
+use FS::session;
+use FS::svc_acct;
+use FS::svc_acct_pop qw(popselector);
+use FS::svc_acct_sm;
+use FS::svc_domain;
+use FS::svc_forward;
+use FS::svc_www;
+use FS::type_pkgs;
 
 sub Script_OnStart {
   $cgi = new CGI;
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 6ff9d436c..f80c79e65 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -61,15 +61,45 @@ sub handler
       use Date::Parse;
       use Tie::IxHash;
       use HTML::Entities;
-      use FS::UID qw(cgisuidsetup);
-      use FS::Record qw(qsearch qsearchs fields);
-      use FS::part_svc;
-      use FS::part_pkg;
-      use FS::pkg_svc;
+      use IO::Handle;
+      use IO::File;
+      use String::Approx qw(amatch);
+      use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+      use FS::Record qw(qsearch qsearchs fields dbdef);
+      use FS::Conf;
+      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
+                     small_custview);
+
+      use FS::agent;
+      use FS::agent_type;
+      use FS::domain_record;
+      use FS::cust_bill;
+      use FS::cust_bill_pay;
+      use FS::cust_credit;
+      use FS::cust_credit_bill;
+      use FS::cust_main;
+      use FS::cust_main_county;
+      use FS::cust_pay;
       use FS::cust_pkg;
+      use FS::cust_refund;
       use FS::cust_svc;
+      use FS::nas;
       use FS::part_bill_event;
-      use FS::CGI qw(header menubar popurl table itable ntable);
+      use FS::part_pkg;
+      use FS::part_referral;
+      use FS::part_svc;
+      use FS::pkg_svc;
+      use FS::port;
+      use FS::queue;
+      use FS::raddb;
+      use FS::session;
+      use FS::svc_acct;
+      use FS::svc_acct_pop qw(popselector);
+      use FS::svc_acct_sm;
+      use FS::svc_domain;
+      use FS::svc_forward;
+      use FS::svc_www;
+      use FS::type_pkgs;
 
       $cgi = new CGI;
       &cgisuidsetup($cgi);