3 files changed, 18 insertions, 52 deletions

diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
index 6b1147633..cf6f8d751 100755
--- a/httemplate/misc/process/catchall.cgi
+++ b/httemplate/misc/process/catchall.cgi
@@ -1,26 +1,14 @@
+<!--$Id: catchall.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!--$Id: catchall.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::svc_domain;
-use FS::CGI qw(popurl);
 
 $FS::svc_domain::whois_hack=1;
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_domain',{'svcnum'=>$svcnum}) if $svcnum;
 
-$new = new FS::svc_domain ( {
+my $new = new FS::svc_domain ( {
   map {
     ($_, scalar($cgi->param($_)));
   } ( fields('svc_domain'), qw( pkgnum svcpart ) )
@@ -28,6 +16,7 @@ $new = new FS::svc_domain ( {
 
 $new->setfield('action' => 'M');
 
+my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
index 4be52004b..6f26c8107 100755
--- a/httemplate/misc/process/delete-customer.cgi
+++ b/httemplate/misc/process/delete-customer.cgi
@@ -1,23 +1,12 @@
+<!-- $Id: delete-customer.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: delete-customer.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $conf $custnum $new_custnum $cust_main $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
+my $conf = new FS::Conf;
 die "Customer deletions not enabled" unless $conf->exists('deletecustomers');
 
 $cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
+my $custnum = $1;
+my $new_custnum;
 if ( $cgi->param('new_custnum') ) {
   $cgi->param('new_custnum') =~ /^(\d+)$/
     or die "Illegal new customer number: ". $cgi->param('new_custnum');
@@ -25,10 +14,10 @@ if ( $cgi->param('new_custnum') ) {
 } else {
   $new_custnum = '';
 }
-$cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
+my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
   or die "Customer not found: $custnum";
 
-$error = $cust_main->delete($new_custnum);
+my $error = $cust_main->delete($new_custnum);
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 6b34e8a5d..80a5de81f 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,24 +1,12 @@
+<!-- $Id: link.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: link.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $old $new $error $pkgnum $svcpart $svcnum );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(popurl idiot eidiot);
-use FS::UID qw(cgisuidsetup);
-use FS::cust_svc;
-use FS::Record qw(qsearchs);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('pkgnum') =~ /^(\d+)$/;
-$pkgnum = $1;
+my $pkgnum = $1;
 $cgi->param('svcpart') =~ /^(\d+)$/;
-$svcpart = $1;
+my $svcpart = $1;
 $cgi->param('svcnum') =~ /^(\d*)$/;
-$svcnum = $1;
+my $svcnum = $1;
 
 unless ( $svcnum ) {
   my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
@@ -29,15 +17,15 @@ unless ( $svcnum ) {
   $svcnum=$svc_acct->svcnum;
 }
 
-$old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "svcnum not found!" unless $old;
-$new = new FS::cust_svc ({
+my $new = new FS::cust_svc ({
   'svcnum' => $svcnum,
   'pkgnum' => $pkgnum,
   'svcpart' => $svcpart,
 });
 
-$error = $new->replace($old);
+my $error = $new->replace($old);
 
 unless ($error) {
   #no errors, so let's view this customer.