yet more mod_perl stuff

4 files changed, 57 insertions, 53 deletions

diff --git a/htdocs/edit/process/agent.cgi b/htdocs/edit/process/agent.cgi
index 1dab7601b..c1b397aac 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.6 1999-01-19 05:13:47 ivan Exp $
+# $Id: agent.cgi,v 1.7 1999-01-25 12:09:57 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.6  1999-01-19 05:13:47  ivan
+# Revision 1.7  1999-01-25 12:09:57  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:47  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -34,7 +37,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::agent;
-use FS::CGI qw(idiot popurl);
+use FS::CGI qw(popurl);
 
 $cgi = new CGI;
 
@@ -44,10 +47,6 @@ $agentnum = $cgi->param('agentnum');
 
 $old = qsearchs('agent',{'agentnum'=>$agentnum}) if $agentnum;
 
-#unmunge typenum
-$cgi->param('typenum') =~ /^(\d+)(:.*)?$/;
-$cgi->param('typenum',$1);
-
 $new = new FS::agent ( {
   map {
     $_, scalar($cgi->param($_));
@@ -62,7 +61,8 @@ if ( $agentnum ) {
 }
 
 if ( $error ) {
-  &idiot($error);
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent.cgi?". $cgi->query_string );
 } else { 
   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 e13817121..99c54ab3b 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.6 1999-01-19 05:13:48 ivan Exp $
+# $Id: agent_type.cgi,v 1.7 1999-01-25 12:09:58 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.6  1999-01-19 05:13:48  ivan
+# Revision 1.7  1999-01-25 12:09:58  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.6  1999/01/19 05:13:48  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -31,7 +34,7 @@ use strict;
 use vars qw ( $cgi $typenum $old $new $error $part_pkg );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
-use FS::CGI qw(idiot popurl);
+use FS::CGI qw( popurl);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs fields);
 use FS::agent_type;
@@ -58,7 +61,8 @@ if ( $typenum ) {
 }
 
 if ( $error ) {
-  idiot($error);
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "agent_type.cgi?". $cgi->query_string );
   exit;
 }
 
@@ -72,10 +76,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->delete;
-    if ( $error ) {
-      idiot($error);
-      exit;
-    }
+    die $error if $error;
 
   } elsif ( $cgi->param("pkgpart$pkgpart")
             && ! $type_pkgs
@@ -86,10 +87,7 @@ foreach $part_pkg (qsearch('part_pkg',{})) {
       'pkgpart' => $pkgpart,
     });
     $error= $type_pkgs->insert;
-    if ( $error ) {
-      idiot($error);
-      exit;
-    }
+    die $error if $error;
   }
 
 }
diff --git a/htdocs/edit/process/cust_credit.cgi b/htdocs/edit/process/cust_credit.cgi
index 8f4515e48..f95688197 100755
--- a/htdocs/edit/process/cust_credit.cgi
+++ b/htdocs/edit/process/cust_credit.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_credit.cgi,v 1.4 1999-01-19 05:13:49 ivan Exp $
+# $Id: cust_credit.cgi,v 1.5 1999-01-25 12:09:59 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_credit.cgi
@@ -22,7 +22,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_credit.cgi,v $
-# Revision 1.4  1999-01-19 05:13:49  ivan
+# Revision 1.5  1999-01-25 12:09:59  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.4  1999/01/19 05:13:49  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -38,7 +41,7 @@ use vars qw( $cgi $custnum $new $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(popurl eidiot);
+use FS::CGI qw(popurl);
 use FS::Record qw(fields);
 use FS::cust_credit;
 
@@ -54,12 +57,16 @@ $new = new FS::cust_credit ( {
   map {
     $_, scalar($cgi->param($_));
   #} qw(custnum _date amount otaker reason)
-  } fields('cust_credit');
+  } fields('cust_credit')
 } );
 
 $error=$new->insert;
-&eidiot($error) if $error;
 
-#no errors, no refund, so view our credit.
-print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#history");
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_credit.cgi?". $cgi->query_string );
+} else {
+  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 850f2add4..3262c42e2 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.5 1999-01-19 05:13:50 ivan Exp $
+# $Id: cust_main.cgi,v 1.6 1999-01-25 12:10:00 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.5  1999-01-19 05:13:50  ivan
+# Revision 1.6  1999-01-25 12:10:00  ivan
+# yet more mod_perl stuff
+#
+# Revision 1.5  1999/01/19 05:13:50  ivan
 # for mod_perl: no more top-level my() variables; use vars instead
 # also the last s/create/new/;
 #
@@ -37,11 +40,11 @@
 #
 
 use strict;
-use vars qw( $cgi $payby @invoicing_list $new $custnum );
+use vars qw( $cgi $payby @invoicing_list $new $custnum $error );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(eidiot popurl);
+use FS::CGI qw( popurl );
 use FS::Record qw(qsearchs fields);
 use FS::cust_main;
 
@@ -50,8 +53,6 @@ $cgi = new CGI;
 
 #unmunge stuff
 
-$cgi->param('agentnum', (split(/:/, ($cgi->param('agentnum'))[0] ))[0] );
-
 $cgi->param('tax','') unless defined($cgi->param('tax'));
 
 $cgi->param('refnum', (split(/:/, ($cgi->param('refnum'))[0] ))[0] );
@@ -61,11 +62,12 @@ $cgi->param('state', $1);
 $cgi->param('county', $3 || '');
 $cgi->param('country', $4);
 
-$payby = $cgi->param('payby');
-$cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
-$cgi->param('paydate',
+if ( $payby = $cgi->param('payby') ) {
+  $cgi->param('payinfo', $cgi->param( $payby. '_payinfo' ) );
+  $cgi->param('paydate',
   $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ) );
-$cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+  $cgi->param('payname', $cgi->param( $payby. '_payname' ) );
+}
 
 $cgi->param('otaker', &getotaker );
 
@@ -83,25 +85,22 @@ $new = new FS::cust_main ( {
   } fields('cust_main')
 } );
 
+$error = $new->check_invoicing_list( \@invoicing_list );
+
 #perhaps the invocing_list magic should move to cust_main.pm?
 if ( $new->custnum eq '' ) {
-  my $error;
-  $error = $new->check_invoicing_list( \@invoicing_list );
-  &ediot($error) if $error;
-  $error = $new->insert;
-  &eidiot($error) if $error;
-  $new->invoicing_list( \@invoicing_list );
+  $error ||= $new->insert;
 } else { #create old record object
-  my $error;
   my $old = qsearchs( 'cust_main', { 'custnum' => $new->custnum } ); 
-  &eidiot("Old record not found!") unless $old;
-  $error = $new->check_invoicing_list( \@invoicing_list );
-  &eidiot($error) if $error;
-  $error = $new->replace($old);
-  &eidiot($error) if $error;
-  $new->invoicing_list( \@invoicing_list );
+  $error ||= "Old record not found!" unless $old;
+  $error ||= $new->replace($old);
 }
 
-$custnum = $new->custnum;
-print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
-
+if ( $error ) {
+  $cgi->param('error', $error);
+  print $cgi->redirect(popurl(2). "cust_main.cgi?". $cgi->query_string );
+} else { 
+  $new->invoicing_list( \@invoicing_list );
+  $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_main");
+}