X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fcatchall.cgi;h=3402b61e67d9b766f6e144f60ed1d1fc86307ae7;hb=f5ea7f4cc190dcb399bb19615ac8f48e19b9fa3d;hp=7e90ac4e070334a06eaedc5df49a901af6e21a17;hpb=91387f8f489e561deaf1de052d80ef800a4970a3;p=freeside.git
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 7e90ac4e0..3402b61e6 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,24 +1,9 @@
+
<%
-#
-
-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( @FS::CGI::header ), header("Domain Catchall Edit", '');
+my $p1 = popurl(1);
+print header("Domain Catchall Edit", '');
print qq!Error: !, $cgi->param('error'),
""
@@ -117,7 +103,7 @@ print qq!!;
#svcpart
print qq!!;
-($domain,$catchall)=(
+my($domain,$catchall)=(
$svc_domain->domain,
$svc_domain->catchall,
);