1 files changed, 18 insertions, 32 deletions
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;
-}