From 9839e6383a3ff00a352c8386a9bbe48e630a6a89 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Dec 1998 08:40:30 +0000
Subject: [PATCH] s/CGI::Request/CGI.pm/; etc

---
 htdocs/edit/process/agent.cgi                   | 11 +++---
 htdocs/edit/process/agent_type.cgi              | 14 +++----
 htdocs/edit/process/cust_credit.cgi             | 46 ++++++++---------------
 htdocs/edit/process/cust_main.cgi               | 13 ++++---
 htdocs/edit/process/cust_main_county-expand.cgi |  9 +++--
 htdocs/edit/process/cust_main_county.cgi        | 11 ++++--
 htdocs/edit/process/cust_pay.cgi                | 38 ++++++++-----------
 htdocs/edit/process/cust_pkg.cgi                | 41 ++++++++------------
 htdocs/edit/process/part_pkg.cgi                | 15 ++++----
 htdocs/edit/process/part_referral.cgi           | 22 ++++++-----
 htdocs/edit/process/part_svc.cgi                | 11 +++---
 htdocs/edit/process/svc_acct.cgi                | 50 +++++++++----------------
 htdocs/edit/process/svc_acct_pop.cgi            | 21 +++++++----
 htdocs/edit/process/svc_acct_sm.cgi             | 41 ++++++++------------
 htdocs/edit/process/svc_domain.cgi              | 42 ++++++++-------------
 15 files changed, 169 insertions(+), 216 deletions(-)

diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index 423926d0f..1bb5bbaae 100755
--- a/htdocs/edit/process/agent.cgi
+++ b/htdocs/edit/process/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.2 1998-11-23 07:52:29 ivan Exp $
+# $Id: agent.cgi,v 1.3 1998-12-17 08:40:16 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.2  1998-11-23 07:52:29  ivan
+# Revision 1.3  1998-12-17 08:40:16  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/23 07:52:29  ivan
 # *** empty log message ***
 #
 
@@ -51,8 +54,6 @@ if ( $agentnum ) {
 if ( $error ) {
   &idiot($error);
 } else { 
-  #$req->cgi->redirect("../../view/agent.cgi?$agentnum");
-  #$req->cgi->redirect("../../edit/agent.cgi?$agentnum");
-  print $cgi->redirect(popurl(3). "/browse/agent.cgi");
+  print $cgi->redirect(popurl(3). "browse/agent.cgi");
 }
 
diff --git a/htdocs/edit/process/agent_type.cgi b/htdocs/edit/process/agent_type.cgi
index 7a70198f8..c6f607d42 100755
--- a/htdocs/edit/process/agent_type.cgi
+++ b/htdocs/edit/process/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.2 1998-11-21 07:49:20 ivan Exp $
+# $Id: agent_type.cgi,v 1.3 1998-12-17 08:40:17 ivan Exp $
 #
 # ivan@sisd.com 97-dec-11
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.2  1998-11-21 07:49:20  ivan
+# Revision 1.3  1998-12-17 08:40:17  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/21 07:49:20  ivan
 # s/CGI::Request/CGI.pm/
 #
 
@@ -59,8 +62,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
   });
   if ( $type_pkgs && ! $cgi->param("pkgpart$pkgpart") ) {
     my($d_type_pkgs)=$type_pkgs; #need to save $type_pkgs for below.
-    $error=$d_type_pkgs->del; #FS::Record not FS::type_pkgs,
-                                  #so ->del not ->delete.  hmm.  hmm.
+    $error=$d_type_pkgs->delete;
     if ( $error ) {
       idiot($error);
       exit;
@@ -83,7 +85,5 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
 
 }
 
-#$req->cgi->redirect("../../view/agent_type.cgi?$typenum");
-#$req->cgi->redirect("../../edit/agent_type.cgi?$typenum");
-print $cgi->redirect(popurl(3). "/browse/agent_type.cgi");
+print $cgi->redirect(popurl(3). "browse/agent_type.cgi");
 
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index e660b4c78..e87d588d3 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_credit.cgi: Add a credit (process form)
+# $Id: cust_credit.cgi,v 1.2 1998-12-17 08:40:18 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -20,51 +20,37 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_credit.cgi,v $
+# Revision 1.2  1998-12-17 08:40:18  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
+use FS::CGI qw(popurl eidiot);
 use FS::cust_credit;
 
-my($req)=new CGI::Request; # create form object
-cgisuidsetup($req->cgi);
+my($cgi)=new CGI; # create form object
+cgisuidsetup($cgi);
 
-$req->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
+$cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
 my($custnum)=$1;
 
-$req->param('otaker',getotaker);
+$cgi->param('otaker',getotaker);
 
 my($new) = create FS::cust_credit ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(custnum _date amount otaker reason)
 } );
 
 my($error);
 $error=$new->insert;
-&idiot($error) if $error;
+&eidiot($error) if $error;
 
 #no errors, no refund, so view our credit.
-$req->cgi->redirect("../../view/cust_main.cgi?$custnum#history");
-
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error posting credit/refund</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error posting credit/refund</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and press the <I>Post</I> button again.
-  </BODY>
-</HTML>
-END
-
-}
+print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#history");
 
diff --git a/htdocs/edit/process/cust_main.cgi b/htdocs/edit/process/cust_main.cgi
index 5f13a9301..8404ba894 100755
--- a/htdocs/edit/process/cust_main.cgi
+++ b/htdocs/edit/process/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.2 1998-11-18 08:57:36 ivan Exp $
+# $Id: cust_main.cgi,v 1.3 1998-12-17 08:40:19 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.2  1998-11-18 08:57:36  ivan
+# Revision 1.3  1998-12-17 08:40:19  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 08:57:36  ivan
 # i18n, s/CGI-modules/CGI.pm/, FS::CGI::idiot instead of inline, FS::CGI::popurl
 #
 
@@ -34,7 +37,7 @@ use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::cust_main;
 
-my($req)=new CGI;
+my($cgi)=new CGI;
 
 &cgisuidsetup($cgi);
 
@@ -61,7 +64,7 @@ $cgi->param('country', $4);
 
 my($new) = create FS::cust_main ( {
   map {
-    $_, $cgi->param("$_") || ''
+    $_, scalar($cgi->param($_))
   } qw(custnum agentnum last first ss company address1 address2 city county
        state zip daytime night fax payby payinfo paydate payname tax
        otaker refnum)
@@ -82,5 +85,5 @@ if ( $new->custnum eq '' ) {
 }
 
 my($custnum)=$new->custnum;
-print $cgi->redirect(popurl(3). "/view/cust_main.cgi?$custnum#cust_main");
+print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
 
diff --git a/htdocs/edit/process/cust_main_county-expand.cgi b/htdocs/edit/process/cust_main_county-expand.cgi
index c70d5b9d7..368949e50 100755
--- a/htdocs/edit/process/cust_main_county-expand.cgi
+++ b/htdocs/edit/process/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.2 1998-11-18 09:01:40 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 08:40:20 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -15,7 +15,10 @@
 # ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.2  1998-11-18 09:01:40  ivan
+# Revision 1.3  1998-12-17 08:40:20  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:40  ivan
 # i18n! i18n!
 #
 
@@ -78,5 +81,5 @@ unless ( qsearch('cust_main',{
   die $error if $error;
 }
 
-print $cgi->redirect(popurl(3). "/edit/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "edit/cust_main_county.cgi");
 
diff --git a/htdocs/edit/process/cust_main_county.cgi b/htdocs/edit/process/cust_main_county.cgi
index ce5a4f671..11f55f236 100755
--- a/htdocs/edit/process/cust_main_county.cgi
+++ b/htdocs/edit/process/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:41 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.3 1998-12-17 08:40:21 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.2  1998-11-18 09:01:41  ivan
+# Revision 1.3  1998-12-17 08:40:21  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/18 09:01:41  ivan
 # i18n! i18n!
 #
 
@@ -22,7 +25,7 @@ use FS::CGI qw(eidiot);
 use FS::Record qw(qsearch qsearchs);
 use FS::cust_main_county;
 
-my($req)=new CGI;
+my($cgi)=new CGI;
 &cgisuidsetup($cgi);
 
 foreach ( $cgi->param ) {
@@ -38,5 +41,5 @@ foreach ( $cgi->param ) {
   eidiot($error) if $error;
 }
 
-$cgi->redirect(popurl(3). "/browse/cust_main_county.cgi");
+print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
 
diff --git a/htdocs/edit/process/cust_pay.cgi b/htdocs/edit/process/cust_pay.cgi
index 9ec97532b..619a93a2a 100755
--- a/htdocs/edit/process/cust_pay.cgi
+++ b/htdocs/edit/process/cust_pay.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_pay.cgi: Add a payment (process form)
+# $Id: cust_pay.cgi,v 1.2 1998-12-17 08:40:22 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_pay.cgi
@@ -13,21 +13,28 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pay.cgi,v $
+# Revision 1.2  1998-12-17 08:40:22  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
+use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(idiot popurl);
 use FS::cust_pay qw(fields);
 
-my($req)=new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi)=new CGI;
+&cgisuidsetup($cgi);
 
-$req->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('invnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($invnum)=$1;
 
 my($new) = create FS::cust_pay ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(invnum paid _date payby payinfo paybatch)
 } );
 
@@ -35,23 +42,8 @@ my($error);
 $error=$new->insert;
 
 if ($error) { #error!
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error posting payment</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error posting payment</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and press the <I>Post</I> button again.
-  </BODY>
-</HTML>
-END
+  idiot($error);
 } else { #no errors!
-  $req->cgi->redirect("../../view/cust_bill.cgi?$invnum");
+  print $cgi->redirect(popurl(3). "view/cust_bill.cgi?$invnum");
 }
 
diff --git a/htdocs/edit/process/cust_pkg.cgi b/htdocs/edit/process/cust_pkg.cgi
index 6f5bc875a..9cd9e02f1 100755
--- a/htdocs/edit/process/cust_pkg.cgi
+++ b/htdocs/edit/process/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/cust_pkg.cgi: Add/edit packages (process form)
+# $Id: cust_pkg.cgi,v 1.2 1998-12-17 08:40:23 ivan Exp $
 #
 # this is for changing packages around, not for editing things within the
 # package
@@ -19,30 +19,36 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: cust_pkg.cgi,v $
+# Revision 1.2  1998-12-17 08:40:23  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(idiot popurl);
 use FS::cust_pkg;
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
 #untaint custnum
-$req->param('new_custnum') =~ /^(\d+)$/;
+$cgi->param('new_custnum') =~ /^(\d+)$/;
 my($custnum)=$1;
 
 my(@remove_pkgnums) = map {
   /^(\d+)$/ or die "Illegal remove_pkg value!";
   $1;
-} $req->param('remove_pkg');
+} $cgi->param('remove_pkg');
 
 my(@pkgparts);
 my($pkgpart);
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $req->params ) {
-  my($num_pkgs)=$req->param("pkg$pkgpart");
+foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+  my($num_pkgs)=$cgi->param("pkg$pkgpart");
   while ( $num_pkgs-- ) {
     push @pkgparts,$pkgpart;
   }
@@ -51,23 +57,8 @@ foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $req->params ) {
 my($error) = FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
 
 if ($error) {
-  CGI::Base::SendHeaders();
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error updating packages</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error updating packages</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
+  idiot($error);
 } else {
-  $req->cgi->redirect("../../view/cust_main.cgi?$custnum#cust_pkg");
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg");
 }
 
diff --git a/htdocs/edit/process/part_pkg.cgi b/htdocs/edit/process/part_pkg.cgi
index 5c58752c8..dca8f1374 100755
--- a/htdocs/edit/process/part_pkg.cgi
+++ b/htdocs/edit/process/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:17:58 ivan Exp $
+# $Id: part_pkg.cgi,v 1.4 1998-12-17 08:40:24 ivan Exp $
 #
 # process/part_pkg.cgi: Edit package definitions (process form)
 #
@@ -17,7 +17,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.3  1998-11-21 07:17:58  ivan
+# Revision 1.4  1998-12-17 08:40:24  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.3  1998/11/21 07:17:58  ivan
 # bugfix to work for regular aswell as custom pricing
 #
 # Revision 1.2  1998/11/15 13:16:15  ivan
@@ -43,7 +46,7 @@ my($old)=qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart;
 
 my($new)=create FS::part_pkg ( {
   map {
-    $_, $cgi->param($_);
+    $_, scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
@@ -90,9 +93,7 @@ foreach $part_svc (qsearch('part_svc',{})) {
 }
 
 unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  #$req->cgi->redirect("../../view/part_pkg.cgi?$pkgpart");
-  #$req->cgi->redirect("../../edit/part_pkg.cgi?$pkgpart");
-  print $cgi->redirect(popurl(3). "/browse/part_pkg.cgi");
+  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
 } else {
   my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } );
   my %hash = $old_cust_pkg->hash;
@@ -100,7 +101,7 @@ unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   my($new_cust_pkg) = create FS::cust_pkg \%hash;
   my $error = $new_cust_pkg->replace($old_cust_pkg);
   eidiot "Error modifying cust_pkg record: $error\n" if $error;
-  print $cgi->redirect(popurl(3). "/view/cust_main.cgi?". $new_cust_pkg->custnum);
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum);
 }
 
 
diff --git a/htdocs/edit/process/part_referral.cgi b/htdocs/edit/process/part_referral.cgi
index 08a4c01d0..94d29c40e 100755
--- a/htdocs/edit/process/part_referral.cgi
+++ b/htdocs/edit/process/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/part_referral.cgi: Edit referrals (process form)
+# $Id: part_referral.cgi,v 1.2 1998-12-17 08:40:25 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -8,25 +8,29 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: part_referral.cgi,v $
+# Revision 1.2  1998-12-17 08:40:25  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::part_referral qw(fields);
-use FS::CGI qw(eidiot);
-use FS::CGI qw(eidiot);
+use FS::CGI qw(popurl eidiot);
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-my($refnum)=$req->param('refnum');
+my($refnum)=$cgi->param('refnum');
 
 my($new)=create FS::part_referral ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } fields('part_referral')
 } );
 
@@ -41,5 +45,5 @@ if ( $refnum ) {
 }
 
 $refnum=$new->getfield('refnum');
-$req->cgi->redirect("../../browse/part_referral.cgi");
+print $cgi->redirect(popurl(3). "browse/part_referral.cgi");
 
diff --git a/htdocs/edit/process/part_svc.cgi b/htdocs/edit/process/part_svc.cgi
index 48cc7fec3..0f67410ee 100755
--- a/htdocs/edit/process/part_svc.cgi
+++ b/htdocs/edit/process/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.2 1998-11-21 06:43:08 ivan Exp $
+# $Id: part_svc.cgi,v 1.3 1998-12-17 08:40:26 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.2  1998-11-21 06:43:08  ivan
+# Revision 1.3  1998-12-17 08:40:26  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
+# Revision 1.2  1998/11/21 06:43:08  ivan
 # s/CGI::Request/CGI.pm/
 #
 
@@ -46,7 +49,5 @@ if ( $svcpart ) {
   $svcpart=$new->getfield('svcpart');
 }
 
-#$req->cgi->redirect("../../view/part_svc.cgi?$svcpart");
-#$req->cgi->redirect("../../edit/part_svc.cgi?$svcpart");
-print $cgi->redirect(popurl(3)."/browse/part_svc.cgi");
+print $cgi->redirect(popurl(3)."browse/part_svc.cgi");
 
diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 8d77ba703..644a0444e 100755
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_acct.cgi: Add/edit a customer (process form)
+# $Id: svc_acct.cgi,v 1.2 1998-12-17 08:40:27 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -21,67 +21,53 @@
 # Changes to allow page to work at a relative position in server
 # Changed 'password' to '_password' because Pg6.3 reserves the password word
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.2  1998-12-17 08:40:27  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
+use FS::CGI qw(eidiot popurl);
 use FS::Record qw(qsearchs);
 use FS::svc_acct;
 
-my($req) = new CGI::Request; # create form object
-&cgisuidsetup($req->cgi);
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
 
-$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
 my($old)=qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge popnum
-$req->param('popnum', (split(/:/, $req->param('popnum') ))[0] );
+$cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
 
 #unmunge passwd
-if ( $req->param('_password') eq '*HIDDEN*' ) {
-  $req->param('_password',$old->getfield('_password'));
+if ( $cgi->param('_password') eq '*HIDDEN*' ) {
+  $cgi->param('_password',$old->getfield('_password'));
 }
 
 my($new) = create FS::svc_acct ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
     shell quota slipip)
 } );
 
 if ( $svcnum ) {
   my($error) = $new->replace($old);
-  &idiot($error) if $error;
+  &eidiot($error) if $error;
 } else {
   my($error) = $new->insert;
-  &idiot($error) if $error;
+  &eidiot($error) if $error;
   $svcnum = $new->getfield('svcnum');
 }
 
 #no errors, view account
-$req->cgi->redirect("../../view/svc_acct.cgi?" . $svcnum );
+print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
 
-sub idiot {
-  my($error)=@_;
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error adding/updating account</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error adding/updating account</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-  exit;
-}
 
diff --git a/htdocs/edit/process/svc_acct_pop.cgi b/htdocs/edit/process/svc_acct_pop.cgi
index 18d7940b4..89cc75c35 100755
--- a/htdocs/edit/process/svc_acct_pop.cgi
+++ b/htdocs/edit/process/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_acct_pop.cgi: Edit POP (process form)
+# $Id: svc_acct_pop.cgi,v 1.2 1998-12-17 08:40:28 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -8,26 +8,31 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
+#
+# $Log: svc_acct_pop.cgi,v $
+# Revision 1.2  1998-12-17 08:40:28  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
 use FS::svc_acct_pop qw(fields);
-use FS::CGI qw(eidiot);
+use FS::CGI qw(popurl eidiot);
 
-my($req)=new CGI::Request; # create form object
+my($cgi)=new CGI; # create form object
 
-&cgisuidsetup($req->cgi);
+&cgisuidsetup($cgi);
 
-my($popnum)=$req->param('popnum');
+my($popnum)=$cgi->param('popnum');
 
 my($old)=qsearchs('svc_acct_pop',{'popnum'=>$popnum}) if $popnum;
 
 my($new)=create FS::svc_acct_pop ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } fields('svc_acct_pop')
 } );
 
@@ -39,5 +44,5 @@ if ( $popnum ) {
   eidiot($error) if $error;
   $popnum=$new->getfield('popnum');
 }
-$req->cgi->redirect("../../browse/svc_acct_pop.cgi");
+print $cgi->redirect(popurl(3). "browse/svc_acct_pop.cgi");
 
diff --git a/htdocs/edit/process/svc_acct_sm.cgi b/htdocs/edit/process/svc_acct_sm.cgi
index 9ad546bf4..74ddc1a18 100755
--- a/htdocs/edit/process/svc_acct_sm.cgi
+++ b/htdocs/edit/process/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_acct_sm.cgi: Add/edit a mail alias (process form)
+# $Id: svc_acct_sm.cgi,v 1.2 1998-12-17 08:40:29 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct_sm.cgi
@@ -22,29 +22,34 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.2  1998-12-17 08:40:29  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
 use FS::svc_acct_sm;
 
-my($req)=new CGI::Request; # create form object
-cgisuidsetup($req->cgi);
+my($cgi)=new CGI; # create form object
+cgisuidsetup($cgi);
 
-$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
 my($old)=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum}) if $svcnum;
 
 #unmunge domsvc and domuid
-$req->param('domsvc',(split(/:/, $req->param('domsvc') ))[0] );
-$req->param('domuid',(split(/:/, $req->param('domuid') ))[0] );
+$cgi->param('domsvc',(split(/:/, $cgi->param('domsvc') ))[0] );
+$cgi->param('domuid',(split(/:/, $cgi->param('domuid') ))[0] );
 
 my($new) = create FS::svc_acct_sm ( {
   map {
-    ($_, scalar($req->param($_)));
+    ($_, scalar($cgi->param($_)));
   } qw(svcnum pkgnum svcpart domuser domuid domsvc)
 } );
 
@@ -57,24 +62,8 @@ if ( $svcnum ) {
 } 
 
 unless ($error) {
-  $req->cgi->redirect("../../view/svc_acct_sm.cgi?$svcnum");
+  print $cgi->redirect(popurl(3). "view/svc_acct_sm.cgi?$svcnum");
 } else {
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error adding/editing mail alias</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error adding/editing mail alias</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-
+  idiot($error);
 }
 
diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index 0782772dd..e4b751dbb 100755
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# process/svc_domain.cgi: Add a domain (process form)
+# $Id: svc_domain.cgi,v 1.2 1998-12-17 08:40:30 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -18,9 +18,14 @@
 #
 # Changes to allow page to work at a relative position in server
 #       bmccane@maxbaud.net     98-apr-3
+#
+# $Log: svc_domain.cgi,v $
+# Revision 1.2  1998-12-17 08:40:30  ivan
+# s/CGI::Request/CGI.pm/; etc
+#
 
 use strict;
-use CGI::Request;
+use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
@@ -29,24 +34,24 @@ use FS::svc_domain;
 #remove this to actually test the domains!
 $FS::svc_domain::whois_hack = 1;
 
-my($req) = new CGI::Request;
-&cgisuidsetup($req->cgi);
+my($cgi) = new CGI;
+&cgisuidsetup($cgi);
 
-$req->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
+$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my($svcnum)=$1;
 
 my($new) = create FS::svc_domain ( {
   map {
-    $_, $req->param($_);
+    $_, scalar($cgi->param($_));
   } qw(svcnum pkgnum svcpart domain action purpose)
 } );
 
 my($error);
-if ($req->param('legal') ne "Yes") {
+if ($cgi->param('legal') ne "Yes") {
   $error = "Customer did not agree to be bound by NSI's ".
     qq!<A HREF="http://rs.internic.net/help/agreement.txt">!.
     "Domain Name Resgistration Agreement</A>";
-} elsif ($req->param('svcnum')) {
+} elsif ($cgi->param('svcnum')) {
   $error="Can't modify a domain!";
 } else {
   $error=$new->insert;
@@ -54,25 +59,8 @@ if ($req->param('legal') ne "Yes") {
 }
 
 unless ($error) {
-  $req->cgi->redirect("../../view/svc_domain.cgi?$svcnum");
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
 } else {
-  CGI::Base::SendHeaders(); # one guess
-  print <<END;
-<HTML>
-  <HEAD>
-    <TITLE>Error adding domain</TITLE>
-  </HEAD>
-  <BODY>
-    <CENTER>
-    <H4>Error adding domain</H4>
-    </CENTER>
-    Your update did not occur because of the following error:
-    <P><B>$error</B>
-    <P>Hit the <I>Back</I> button in your web browser, correct this mistake, and submit the form again.
-  </BODY>
-</HTML>
-END
-
+  idiot($error);
 }
 
-
-- 
2.11.0