X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htdocs%2Fedit%2Fpart_pkg.cgi;h=e7ac2aeb22d37b7fcc2c1a171ccee372fcb4be38;hb=cd6989b0380bb289bffac0b947a3bfa6eb8c773e;hp=ed309128dc35a847050b4ff0d0018961198ecc2e;hpb=61f2610ee6b8660a206a05675899ed72a5e59296;p=freeside.git

diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index ed309128d..e7ac2aeb2 100755
--- a/htdocs/edit/part_pkg.cgi
+++ b/htdocs/edit/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.2 1998-11-15 13:14:55 ivan Exp $
+# $Id: part_pkg.cgi,v 1.8 1999-01-19 05:13:39 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,11 +13,32 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.2  1998-11-15 13:14:55  ivan
+# Revision 1.8  1999-01-19 05:13:39  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.7  1999/01/18 09:41:29  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.6  1998/12/17 06:17:05  ivan
+# fix double // in relative URLs, s/CGI::Base/CGI/;
+#
+# Revision 1.5  1998/11/21 07:12:26  ivan
+# *** empty log message ***
+#
+# Revision 1.4  1998/11/21 07:11:08  ivan
+# *** empty log message ***
+#
+# Revision 1.3  1998/11/21 07:07:40  ivan
+# popurl, bugfix
+#
+# Revision 1.2  1998/11/15 13:14:55  ivan
 # first pass as per-user custom pricing
 #
 
 use strict;
+use vars qw( $cgi $part_pkg $action $query $hashref $part_svc $count );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
@@ -25,42 +46,42 @@ use FS::Record qw(qsearch qsearchs);
 use FS::part_pkg;
 use FS::part_svc;
 use FS::pkg_svc;
-use FS::CGI qw(header menubar);
+use FS::CGI qw(header menubar popurl);
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-if ( $cgi->param('clone') =~ /^(\d+)$/ ) {
+if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
   $cgi->param('clone', $1);
 } else {
   $cgi->param('clone', '');
 }
-if ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
+if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
   $cgi->param('pkgnum', $1);
 } else {
   $cgi->param('pkgnum', '');
 }
 
-my($part_pkg,$action);
+($query) = $cgi->keywords;
 if ( $cgi->param('clone') ) {
   $action='Custom Pricing';
   my $old_part_pkg =
     qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
   $part_pkg = $old_part_pkg->clone;
-} elsif ( $cgi->keywords =~ /^(\d+)$/ ) {
+} elsif ( $query =~ /^(\d+)$/ ) {
   $action='Edit';
   $part_pkg=qsearchs('part_pkg',{'pkgpart'=>$1});
 } else {
   $action='Add';
-  $part_pkg=create FS::part_pkg {};
+  $part_pkg = new FS::part_pkg {};
 }
-my($hashref)=$part_pkg->hashref;
+$hashref = $part_pkg->hashref;
 
-print $cgi->header, header("$action Package Definition", menubar(
-  'Main Menu' => '../',
-  'View all packages' => '../browse/part_pkg.cgi',
-)), '<FORM ACTION="process/part_pkg.cgi" METHOD=POST>';
+print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
+  'Main Menu' => popurl(2),
+  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
+)), '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
 
 if ( $cgi->param('clone') ) {
   print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
@@ -92,15 +113,13 @@ Enter the quantity of each service this package includes.<BR><BR>
 END
 }
 
-my($part_svc);
-my($count) = 0 ;
 foreach $part_svc ( qsearch('part_svc',{}) ) {
 
   my($svcpart)=$part_svc->getfield('svcpart');
   my($pkg_svc)=qsearchs('pkg_svc',{
     'pkgpart'  => $cgi->param('clone') || $part_pkg->getfield('pkgpart'),
     'svcpart'  => $svcpart,
-  })  || create FS::pkg_svc({
+  })  || new FS::pkg_svc({
     'pkgpart'  => $part_pkg->getfield('pkgpart'),
     'svcpart'  => $svcpart,
     'quantity' => 0,