Will things ever be the same again?

[freeside.git] / httemplate / edit / process / cust_pkg.cgi

diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index ecaec9b..817c880 100755 (executable)
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,46 +1,44 @@
-<%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+%
+%
+%my $error = '';
+%
+%#untaint custnum
+%$cgi->param('custnum') =~ /^(\d+)$/;
+%my $custnum = $1;
+%
+%my @remove_pkgnums = map {
+%  /^(\d+)$/ or die "Illegal remove_pkg value!";
+%  $1;
+%} $cgi->param('remove_pkg');
+%
+%my $error_redirect;
+%my @pkgparts;
+%if ( $cgi->param('new_pkgpart') =~ /^(\d+)$/ ) { #came from misc/change_pkg.cgi
+%  $error_redirect = "misc/change_pkg.cgi";
+%  @pkgparts = ($1);
+%} else { #came from edit/cust_pkg.cgi
+%  $error_redirect = "edit/cust_pkg.cgi";
+%  foreach my $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
+%    if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
+%      my $num_pkgs = $1;
+%      while ( $num_pkgs-- ) {
+%        push @pkgparts,$pkgpart;
+%      }
+%    } else {
+%      $error = "Illegal quantity";
+%      last;
+%    }
+%  }
+%}
+%
+%$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+%
+%if ($error) {
+%  $cgi->param('error', $error);
+%  print $cgi->redirect(popurl(3). $error_redirect. '?'. $cgi->query_string );
+%} else {
+%  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+%}
+%
+%
 
-use strict;
-use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
-
-@remove_pkgnums = map {
-  /^(\d+)$/ or die "Illegal remove_pkg value!";
-  $1;
-} $cgi->param('remove_pkg');
-
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
-    }
-  } else {
-    $error = "Illegal quantity";
-    last;
-  }
-}
-
-$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
-
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
-}
-
-%>