setting up at least one referral is not optional

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

diff --git a/htdocs/edit/process/svc_acct.cgi b/htdocs/edit/process/svc_acct.cgi
index 7fd87ea..84f93ab 100755 (executable)
--- a/htdocs/edit/process/svc_acct.cgi
+++ b/htdocs/edit/process/svc_acct.cgi
@@ -1,12 +1,10 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1999-01-19 05:13:58 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-08-27 00:26:33 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
 #
-# Note: Should br run setuid root as user nobody.
-#
 # ivan@voicenet.com 96-dec-18
 #
 # Changed /u to /u2
@@ -23,7 +21,16 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1999-01-19 05:13:58  ivan
+# Revision 1.7  1999-08-27 00:26:33  ivan
+# better error messages
+#
+# Revision 1.6  1999/02/28 00:03:45  ivan
+# removed misleading comments
+#
+# Revision 1.5  1999/02/07 09:59:30  ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4  1999/01/19 05:13:58  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -35,11 +42,11 @@
 #
 
 use strict;
-use vars qw( $cgi $svcnum $old $new );
+use vars qw( $cgi $svcnum $old $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw(popurl);
 use FS::Record qw(qsearchs fields);
 use FS::svc_acct;
 
@@ -49,13 +56,19 @@ $cgi = new CGI;
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 $svcnum = $1;
 
-$old = qsearchs('svc_acct',{'svcnum'=>$svcnum}) if $svcnum;
+if ( $svcnum ) {
+  $old = qsearchs('svc_acct', { 'svcnum' => $svcnum } )
+    or die "fatal: can't find account (svcnum $svcnum)!";
+} else {
+  $old = '';
+}
 
 #unmunge popnum
 $cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
 
 #unmunge passwd
 if ( $cgi->param('_password') eq '*HIDDEN*' ) {
+  die "fatal: no previous account to recall hidden password from!" unless $old;
   $cgi->param('_password',$old->getfield('_password'));
 }
 
@@ -68,15 +81,16 @@ $new = new FS::svc_acct ( {
 } );
 
 if ( $svcnum ) {
-  my($error) = $new->replace($old);
-  &eidiot($error) if $error;
+  $error = $new->replace($old);
 } else {
-  my($error) = $new->insert;
-  &eidiot($error) if $error;
-  $svcnum = $new->getfield('svcnum');
+  $error = $new->insert;
+  $svcnum = $new->svcnum;
 }
 
-#no errors, view account
-print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
-
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
+} else {
+  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
+}