remove

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

19 files changed, 90 insertions, 318 deletions

diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index b93df48..93ce4f9 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,29 +1,17 @@
+<!-- $Id: agent.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $agentnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent;
-use FS::CGI qw(popurl);
+my $agentnum = $cgi->param('agentnum');
 
-$cgi = new CGI;
+my $old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
-&cgisuidsetup($cgi);
-
-$agentnum = $cgi->param('agentnum');
-
-$old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
-
-$new = new FS::agent ( {
+my $new = new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent')
 } );
 
+my $error;
 if ( $agentnum ) {
   $error=$new->replace($old);
 } else {
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 37a382e..2d11597 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,29 +1,16 @@
+<!-- $Id: agent_type.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: agent_type.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw ( $cgi $typenum $old $new $error $part_pkg );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw( popurl);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::agent_type;
-use FS::type_pkgs;
-use FS::part_pkg;
+my $typenum = $cgi->param('typenum');
+my $old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$typenum = $cgi->param('typenum');
-$old = qsearchs('agent_type',{'typenum'=>$typenum}) if $typenum;
-
-$new = new FS::agent_type ( {
+my $new = new FS::agent_type ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('agent_type')
 } );
 
+my $error;
 if ( $typenum ) {
   $error=$new->replace($old);
 } else {
@@ -37,7 +24,7 @@ if ( $error ) {
   exit;
 }
 
-foreach $part_pkg (qsearch('part_pkg',{})) {
+foreach my $part_pkg (qsearch('part_pkg',{})) {
   my($pkgpart)=$part_pkg->getfield('pkgpart');
 
   my($type_pkgs)=qsearchs('type_pkgs',{
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index f0d4033..16d30bd 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -1,22 +1,8 @@
+<!-- $Id: cust_bill_pay.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_bill_pay.cgi,v 1.1 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $paynum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::cust_pay;
-use FS::cust_bill_pay;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
-$paynum = $1;
+my $paynum = $1;
 
 my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } )
   or die "No such paynum";
@@ -26,14 +12,14 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_pay->custnum } )
 
 my $custnum = $cust_main->custnum;
 
-$new = new FS::cust_bill_pay ( {
+my $new = new FS::cust_bill_pay ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount invnum)
   } fields('cust_bill_pay')
 } );
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 3bbd749..51fca74 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,32 +1,19 @@
+<!-- $Id: cust_credit.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit.cgi,v 1.5 2001-12-26 15:11:33 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_credit;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
-$custnum = $1;
+my $custnum = $1;
 
 $cgi->param('otaker',getotaker);
 
-$new = new FS::cust_credit ( {
+my $new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount otaker reason)
   } fields('cust_credit')
 } );
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index e84894b..afe2973 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,23 +1,8 @@
+<!-- $Id: cust_credit_bill.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.2 2001-12-18 19:30:31 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $crednum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::cust_credit;
-use FS::cust_credit_bill;
-use FS::cust_refund;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
-$crednum = $1;
+my $crednum = $1;
 
 my $cust_credit = qsearchs('cust_credit', { 'crednum' => $crednum } )
   or die "No such crednum";
@@ -27,6 +12,7 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $cust_credit->custnum } )
 
 my $custnum = $cust_main->custnum;
 
+my $new;
 if ($cgi->param('invnum') =~ /^Refund$/) {
   $new = new FS::cust_refund ( {
     'reason'  => $cust_credit->reason,
@@ -45,7 +31,7 @@ if ($cgi->param('invnum') =~ /^Refund$/) {
   } );
 }
 
-$error=$new->insert;
+my $error = $new->insert;
 
 if ( $error ) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 625a850..fa50dc6 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,22 +1,7 @@
+<!-- $Id: cust_main.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# $Id: cust_main.cgi,v 1.5 2001-10-20 12:18:00 ivan Exp $
 
-use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
-use vars qw( $cust_pkg $cust_svc $svc_acct );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw( popurl );
-use FS::Record qw( qsearch qsearchs fields );
-use FS::cust_main;
-use FS::type_pkgs;
-use FS::agent;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$error = '';
+my $error = '';
 
 #unmunge stuff
 
@@ -37,7 +22,8 @@ $cgi->param('ship_state', $1);
 $cgi->param('ship_county', $3 || '');
 $cgi->param('ship_country', $4);
 
-if ( $payby = $cgi->param('payby') ) {
+my $payby = $cgi->param('payby');
+if ( $payby ) {
   $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
   $cgi->param('paydate',
   $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
@@ -46,12 +32,12 @@ if ( $payby = $cgi->param('payby') ) {
 
 $cgi->param('otaker', &getotaker );
 
-@invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
+my @invoicing_list = split( /\s*\,\s*/, $cgi->param('invoicing_list') );
 push @invoicing_list, 'POST' if $cgi->param('invoicing_list_POST');
 
 #create new record object
 
-$new = new FS::cust_main ( {
+my $new = new FS::cust_main ( {
   map {
     $_, scalar($cgi->param($_))
 #  } qw(custnum agentnum last first ss company address1 address2 city county
@@ -68,8 +54,8 @@ if ( defined($cgi->param('same')) && $cgi->param('same') eq "Y" ) {
 }
 
 #perhaps this stuff should go to cust_main.pm
-$cust_pkg = '';
-$svc_acct = '';
+my $cust_pkg = '';
+my $svc_acct = '';
 if ( $new->custnum eq '' ) {
 
   if ( $cgi->param('pkgpart_svcpart') ) {
@@ -142,7 +128,6 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
 } else { 
-  $custnum = $new->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new->custnum);
 } 
 %>
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 62c2ba7..4888b78 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,23 +1,10 @@
+<!-- $Id: cust_main_county-collapse.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_main_county-collapse.cgi,v 1.1 2001-08-17 11:05:31 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
 #really should do this in a .pm & start transaction
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 5adffc6..b16fab4 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,24 +1,12 @@
+<!-- $Id: cust_main_county-expand.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:17:33 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
+my @expansion;
 if ( $cgi->param('delim') eq 'n' ) {
   @expansion=split(/\n/,$cgi->param('expansion'));
 } elsif ( $cgi->param('delim') eq 's' ) {
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 158a0d0..0f0246b 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,17 +1,5 @@
+<!-- $Id: cust_main_county.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 foreach ( $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 630e8fc..c75e532 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,27 +1,15 @@
+<!-- $Id: cust_pay.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pay.cgi,v 1.5 2001-12-26 05:19:01 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $link $linknum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(fields);
-use FS::cust_pay;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('linknum') =~ /^(\d+)$/
   or die "Illegal linknum: ". $cgi->param('linknum');
-$linknum = $1;
+my $linknum = $1;
 
 $cgi->param('link') =~ /^(custnum|invnum)$/
   or die "Illegal link: ". $cgi->param('link');
-$link = $1;
+my $link = $1;
 
-$new = new FS::cust_pay ( {
+my $new = new FS::cust_pay ( {
   $link => $linknum,
   map {
     $_, scalar($cgi->param($_));
@@ -29,7 +17,7 @@ $new = new FS::cust_pay ( {
   #} fields('cust_pay')
 } );
 
-$error = $new->insert;
+my $error = $new->insert;
 
 if ($error) {
   $cgi->param('error', $error);
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index ecaec9b..25b3201 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,28 +1,19 @@
+<!-- $Id: cust_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
+my $error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
+my $custnum = $1;
 
-@remove_pkgnums = map {
+my @remove_pkgnums = map {
   /^(\d+)$/ or die "Illegal remove_pkg value!";
   $1;
 } $cgi->param('remove_pkg');
 
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+my @pkgparts;
+foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
   if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
     my $num_pkgs = $1;
     while ( $num_pkgs-- ) {
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 08bc9b7..2ba1cbe 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,23 +1,11 @@
+<!-- $Id: part_pkg.cgi,v 1.7 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: part_pkg.cgi,v 1.6 2001-12-27 09:26:14 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::part_pkg;
-use FS::pkg_svc;
-use FS::cust_pkg;
+my $dbh = dbh;
 
-$cgi = new CGI;
-$dbh = &cgisuidsetup($cgi);
+my $pkgpart = $cgi->param('pkgpart');
 
-$pkgpart = $cgi->param('pkgpart');
-
-$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
+my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
 #fixup plandata
 my $plandata = $cgi->param('plandata');
@@ -30,7 +18,7 @@ foreach (qw( setuptax recurtax disabled )) {
   $cgi->param($_, '') unless defined $cgi->param($_);
 }
 
-$new = new FS::part_pkg ( {
+my $new = new FS::part_pkg ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_pkg')
@@ -41,7 +29,7 @@ $new = new FS::part_pkg ( {
 
 #most of the stuff below should move to part_pkg.pm
 
-foreach $part_svc ( qsearch('part_svc', {} ) ) {
+foreach my $part_svc ( qsearch('part_svc', {} ) ) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
   unless ( $quantity =~ /^(\d+)$/ ) {
     $cgi->param('error', "Illegal quantity" );
@@ -59,6 +47,7 @@ local $SIG{PIPE} = 'IGNORE';
 
 local $FS::UID::AutoCommit = 0;
 
+my $error;
 if ( $pkgpart ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index ff94e39..7e37db8 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,26 +1,15 @@
+<!-- $Id: part_referral.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: part_referral.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $refnum $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearchs fields);
-use FS::part_referral;
-use FS::CGI qw(popurl);
+my $refnum = $cgi->param('refnum');
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$refnum = $cgi->param('refnum');
-
-$new = new FS::part_referral ( {
+my $new = new FS::part_referral ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('part_referral')
 } );
 
+my $error;
 if ( $refnum ) {
   my $old = qsearchs( 'part_referral', { 'refnum' =>$ refnum } );
   die "(Old) Record not found!" unless $old;
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index c4f5172..29a954c 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,28 +1,16 @@
+<!-- $Id: quick-cust_pkg.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: quick-cust_pkg.cgi,v 1.3 2001-09-11 10:05:30 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum $pkgpart $error ); #@remove_pkgnums @pkgparts
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl eidiot);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
 
 #untaint custnum
 $cgi->param('custnum') =~ /^(\d+)$/
   or eidiot 'illegal custnum '. $cgi->param('custnum');
-$custnum = $1;
+my $custnum = $1;
 $cgi->param('pkgpart') =~ /^(\d+)$/
   or eidiot 'illegal pkgpart '. $cgi->param('pkgpart');
-$pkgpart = $1;
+my $pkgpart = $1;
 
 my @cust_pkg = ();
-$error ||= FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
+my $error = FS::cust_pkg::order($custnum, [ $pkgpart ], [], \@cust_pkg, );
 
 if ($error) {
   eidiot($error);
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index c500016..178d7d8 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,21 +1,10 @@
+<!-- $Id: svc_acct.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct.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::CGI qw(popurl);
-use FS::Record qw(qsearchs fields);
-use FS::svc_acct;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
+my $svcnum = $1;
 
+my $old;
 if ( $svcnum ) {
   $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
     or die "fatal: can't find account (svcnum $svcnum)!";
@@ -32,7 +21,7 @@ if ( $cgi->param('_password') eq '*HIDDEN*' ) {
   $cgi->param('_password',$old->getfield('_password'));
 }
 
-$new = new FS::svc_acct ( {
+my $new = new FS::svc_acct ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
@@ -40,6 +29,7 @@ $new = new FS::svc_acct ( {
   } ( fields('svc_acct'), qw( pkgnum svcpart ) )
 } );
 
+my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 2b870dc..5d699f2 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,29 +1,17 @@
+<!-- $Id: svc_acct_pop.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $popnum $old $new $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_pop;
-use FS::CGI qw(popurl);
+my $popnum = $cgi->param('popnum');
 
-$cgi = new CGI; # create form object
+my $old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
-&cgisuidsetup($cgi);
-
-$popnum = $cgi->param('popnum');
-
-$old = qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
-
-$new = new FS::svc_acct_pop ( {
+my $new = new FS::svc_acct_pop ( {
   map {
     $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
 } );
 
+my $error = '';
 if ( $popnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index 10afcc1..25cd88d 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,34 +1,23 @@
+<!-- $Id: svc_acct_sm.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_acct_sm.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_acct_sm;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
 #$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
 #$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
-$new = new FS::svc_acct_sm ( {
+my $new = new FS::svc_acct_sm ( {
   map {
     ($_, scalar($cgi->param($_)));
   #} qw(svcnum pkgnum svcpart domuser domuid domsvc)
   } ( fields('svc_acct_sm'), qw( pkgnum svcpart ) )
 } );
 
+my $error = '';
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index e52b68a..0b7ec49 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,31 +1,20 @@
+<!-- $Id: svc_domain.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_domain.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $svcnum $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);
 
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum = $1;
+my $svcnum = $1;
 
-$new = new FS::svc_domain ( {
+my $new = new FS::svc_domain ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart domain action purpose)
   } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
+my $error = '';
 if ($cgi->param('svcnum')) {
   $error="Can't modify a domain!";
 } else {
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index b013bd1..5f0247f 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,29 +1,18 @@
+<!-- $Id: svc_forward.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-#<!-- $Id: svc_forward.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_forward;
-use FS::CGI qw(popurl);
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-$svcnum =$1;
+my $svcnum =$1;
 
-$old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
+my $old = qsearchs('svc_forward',{'svcnum'=>$svcnum}) if $svcnum;
 
-$new = new FS::svc_forward ( {
+my $new = new FS::svc_forward ( {
   map {
     ($_, scalar($cgi->param($_)));
   } ( fields('svc_forward'), qw( pkgnum svcpart ) )
 } );
 
+my $error = '';
 if ( $svcnum ) {
   $error = $new->replace($old);
 } else {