X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fcatchall.cgi;h=3402b61e67d9b766f6e144f60ed1d1fc86307ae7;hp=9ebec6688b7e0f5725f4bcd9c42a431b32a7094c;hb=582e73e52fd2f0324e8836ee66ae69e7a82ed364;hpb=3d671921441ba8422650b54435a1959ad1d4c71d

diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 9ebec6688..3402b61e6 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,24 +1,9 @@
+<!-- mason kludge -->
 <%
-#<!-- $Id: catchall.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
-             $part_svc $query %email $p1 $domain $catchall );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::svc_domain;
-use FS::svc_forward;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
 
+my $conf = new FS::Conf;
+
+my($svc_domain, $svcnum, $pkgnum, $svcpart, $part_svc);
 if ( $cgi->param('error') ) {
   $svc_domain = new FS::svc_domain ( {
     map { $_, scalar($cgi->param($_)) } fields('svc_domain')
@@ -51,6 +36,7 @@ if ( $cgi->param('error') ) {
   }
 }
 
+my %email;
 if ($pkgnum) {
 
   #find all possible user svcnums (and emails)
@@ -91,10 +77,10 @@ if ($pkgnum) {
 }
 
 # add an absence of a catchall
-$email{0} = "(none)";
+$email{''} = "(none)";
 
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Domain Catchall Edit", '');
+my $p1 = popurl(1);
+print header("Domain Catchall Edit", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
@@ -117,7 +103,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-($domain,$catchall)=(
+my($domain,$catchall)=(
   $svc_domain->domain,
   $svc_domain->catchall,
 );