more mod_perl fixes, and bugfixes Peter Wemm sent via email

[freeside.git] / htdocs / edit / process / svc_domain.cgi

diff --git a/htdocs/edit/process/svc_domain.cgi b/htdocs/edit/process/svc_domain.cgi
index e4b751d..fe3c6f7 100755 (executable)
--- a/htdocs/edit/process/svc_domain.cgi
+++ b/htdocs/edit/process/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.2 1998-12-17 08:40:30 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1999-02-07 09:59:33 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -20,33 +20,45 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.2  1998-12-17 08:40:30  ivan
+# Revision 1.5  1999-02-07 09:59:33  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:14:01  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.3  1999/01/18 22:48:02  ivan
+# s/create/new/g; and use fields('table_name')
+#
+# Revision 1.2  1998/12/17 08:40:30  ivan
 # s/CGI::Request/CGI.pm/; etc
 #
 
 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);
+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;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
-my($svcnum)=$1;
+$svcnum = $1;
 
-my($new) = create FS::svc_domain ( {
+$new = new FS::svc_domain ( {
   map {
     $_, scalar($cgi->param($_));
-  } qw(svcnum pkgnum svcpart domain action purpose)
+  #} qw(svcnum pkgnum svcpart domain action purpose)
+  } ( fields('svc_domain'), qw( pkgnum svcpart action purpose ) )
 } );
 
-my($error);
 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">!.
@@ -58,9 +70,10 @@ if ($cgi->param('legal') ne "Yes") {
   $svcnum=$new->svcnum;
 }
 
-unless ($error) {
-  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
+if ($error) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_domain.cgi?". $cgi->query_string );
 } else {
-  idiot($error);
+  print $cgi->redirect(popurl(3). "view/svc_domain.cgi?$svcnum");
 }