yet more mod_perl stuff

[freeside.git] / htdocs / edit / svc_acct_sm.cgi

diff --git a/htdocs/edit/svc_acct_sm.cgi b/htdocs/edit/svc_acct_sm.cgi
index 3f96efc..0de4fa1 100755 (executable)
--- a/htdocs/edit/svc_acct_sm.cgi
+++ b/htdocs/edit/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 06:17:11 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.7 1999-01-19 05:13:45 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct_sm.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -35,7 +35,21 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-26
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 06:17:11  ivan
+# Revision 1.7  1999-01-19 05:13:45  ivan
+# for mod_perl: no more top-level my() variables; use vars instead
+# also the last s/create/new/;
+#
+# Revision 1.6  1999/01/18 09:41:34  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:24  ivan
+# bugfixes; fields isn't exported by derived classes
+#
+# Revision 1.4  1998/12/23 02:58:45  ivan
+# $cgi->keywords instead of $cgi->query_string
+#
+# Revision 1.3  1998/12/17 06:17:11  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/12/16 05:19:15  ivan
@@ -43,23 +57,25 @@
 #
 
 use strict;
-use vars qw($conf);
+use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
+             $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::svc_acct_sm qw(fields);
+use FS::Record qw(qsearch qsearchs fields);
+use FS::svc_acct_sm;
 use FS::Conf;
 
-my($cgi) = new CGI;
+$cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
+$mydomain = $conf->config('domain');
+
 
-my($action,$svcnum,$svc_acct_sm,$pkgnum,$svcpart,$part_svc);
-if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
+($query) = $cgi->keywords;
+if ( $query =~ /^(\d+)$/ ) { #editing
 
   $svcnum=$1;
   $svc_acct_sm=qsearchs('svc_acct_sm',{'svcnum'=>$svcnum})
@@ -78,9 +94,9 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
 } else { #adding
 
-  $svc_acct_sm=create FS::svc_acct_sm({});
+  $svc_acct_sm = new FS::svc_acct_sm({});
 
-  foreach $_ (split(/-/,$cgi->query_string)) { #get & untaint pkgnum & svcpart
+  foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
     $pkgnum=$1 if /^pkgnum(\d+)$/;
     $svcpart=$1 if /^svcpart(\d+)$/;
   }
@@ -101,7 +117,6 @@ if ( $cgi->query_string =~ /^(\d+)$/ ) { #editing
 
 }
 
-my(%username,%domain);
 if ($pkgnum) {
 
   #find all possible uids (and usernames)
@@ -159,8 +174,8 @@ if ($pkgnum) {
   die "\$action eq Add, but \$pkgnum is null!\n";
 }
 
-my $p1 = popurl(1);
-print $cgi->header, header("Mail Alias $action", ''), <<END;
+$p1 = popurl(1);
+print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", ''), <<END;
     <FORM ACTION="${p1}process/svc_acct_sm.cgi" METHOD=POST>
 END
 
@@ -179,7 +194,7 @@ print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
 #svcpart
 print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
 
-my($domuser,$domsvc,$domuid)=(
+($domuser,$domsvc,$domuid)=(
   $svc_acct_sm->domuser,
   $svc_acct_sm->domsvc,
   $svc_acct_sm->domuid,