remove

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

1 files changed, 15 insertions, 32 deletions

diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index bb9587062..fc465dbab 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,34 +1,17 @@
+<!-- $Id: svc_forward.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
-# <!-- $Id: svc_forward.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
-use strict;
-use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
-            $pkgnum $cust_pkg $custnum $part_svc $p $srcsvc $dstsvc $dst
-            $svc $svc_acct $source $destination);
-use CGI;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl menubar );
-use FS::Record qw(qsearchs);
-use FS::Conf;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_acct;
-use FS::svc_forward;
+my $conf = new FS::Conf;
 
-$cgi = new CGI;
-cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_forward = qsearchs('svc_forward',{'svcnum'=>$svcnum});
 die "Unknown svcnum" unless $svc_forward;
 
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
+my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
 if ($pkgnum) {
   $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
   $custnum=$cust_pkg->getfield('custnum');
@@ -37,10 +20,9 @@ if ($pkgnum) {
   $custnum = '';
 }
 
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
-$p = popurl(2);
 print header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
@@ -52,17 +34,18 @@ print header('Mail Forward View', menubar(
   "Main menu" => $p,
 ));
 
-($srcsvc,$dstsvc,$dst) = (
+my($srcsvc,$dstsvc,$dst) = (
   $svc_forward->srcsvc,
   $svc_forward->dstsvc,
   $svc_forward->dst,
 );
-$svc = $part_svc->svc;
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+my $svc = $part_svc->svc;
+my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
   or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
-$source = $svc_acct->email;
+my $source = $svc_acct->email;
+my $destination;
 if ($dstsvc) {
-  $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
+  my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
     or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
   $destination = $svc_acct->email;
 }else{