From 183f64ede863fff923db7e00d962b3495e405477 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 18 Jan 1999 09:41:48 +0000 Subject: [PATCH] all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl (good idea anyway) --- htdocs/browse/agent.cgi | 10 +++++++--- htdocs/browse/agent_type.cgi | 10 +++++++--- htdocs/browse/cust_main_county.cgi | 10 +++++++--- htdocs/browse/part_pkg.cgi | 10 +++++++--- htdocs/browse/part_referral.cgi | 10 +++++++--- htdocs/browse/part_svc.cgi | 10 +++++++--- htdocs/browse/svc_acct_pop.cgi | 10 +++++++--- htdocs/edit/agent.cgi | 10 +++++++--- htdocs/edit/agent_type.cgi | 10 +++++++--- htdocs/edit/cust_credit.cgi | 10 +++++++--- htdocs/edit/cust_main.cgi | 10 +++++++--- htdocs/edit/cust_main_county-expand.cgi | 10 +++++++--- htdocs/edit/cust_main_county.cgi | 10 +++++++--- htdocs/edit/cust_pay.cgi | 10 +++++++--- htdocs/edit/cust_pkg.cgi | 10 +++++++--- htdocs/edit/part_pkg.cgi | 10 +++++++--- htdocs/edit/part_referral.cgi | 10 +++++++--- htdocs/edit/part_svc.cgi | 10 +++++++--- htdocs/edit/svc_acct.cgi | 10 +++++++--- htdocs/edit/svc_acct_pop.cgi | 10 +++++++--- htdocs/edit/svc_acct_sm.cgi | 10 +++++++--- htdocs/edit/svc_domain.cgi | 10 +++++++--- htdocs/misc/link.cgi | 10 +++++++--- htdocs/search/cust_main.cgi | 10 +++++++--- htdocs/search/cust_pkg.cgi | 10 +++++++--- htdocs/search/svc_acct.cgi | 10 +++++++--- htdocs/search/svc_acct_sm.cgi | 10 +++++++--- htdocs/view/cust_bill.cgi | 10 +++++++--- htdocs/view/cust_main.cgi | 10 +++++++--- htdocs/view/cust_pkg.cgi | 10 +++++++--- htdocs/view/svc_acct.cgi | 10 +++++++--- htdocs/view/svc_acct_sm.cgi | 10 +++++++--- htdocs/view/svc_domain.cgi | 10 +++++++--- site_perl/CGI.pm | 8 ++++++-- 34 files changed, 237 insertions(+), 101 deletions(-) diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi index 442ea6ee0..446401eca 100755 --- a/htdocs/browse/agent.cgi +++ b/htdocs/browse/agent.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: agent.cgi,v 1.8 1999-01-18 09:22:26 ivan Exp $ +# $Id: agent.cgi,v 1.9 1999-01-18 09:41:14 ivan Exp $ # # ivan@sisd.com 97-dec-12 # @@ -15,7 +15,11 @@ # lose background, FS::CGI ivan@sisd.com 98-sep-2 # # $Log: agent.cgi,v $ -# Revision 1.8 1999-01-18 09:22:26 ivan +# Revision 1.9 1999-01-18 09:41:14 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.8 1999/01/18 09:22:26 ivan # changes to track email addresses for email invoicing # # Revision 1.7 1998/12/17 05:25:16 ivan @@ -65,7 +69,7 @@ my($cgi) = new CGI; my($p)=popurl(2); -print $cgi->header, header('Agent Listing', menubar( +print $cgi->header( '-expires' => 'now' ), header('Agent Listing', menubar( 'Main Menu' => $p, 'Agent Types' => $p. 'browse/agent_type.cgi', # 'Add new agent' => '../edit/agent.cgi' diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi index a1fa3b28e..8bbf1e291 100755 --- a/htdocs/browse/agent_type.cgi +++ b/htdocs/browse/agent_type.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: agent_type.cgi,v 1.3 1998-12-17 05:25:17 ivan Exp $ +# $Id: agent_type.cgi,v 1.4 1999-01-18 09:41:15 ivan Exp $ # # ivan@sisd.com 97-dec-10 # @@ -11,7 +11,11 @@ # lose background, FS::CGI ivan@sisd.com 98-sep-2 # # $Log: agent_type.cgi,v $ -# Revision 1.3 1998-12-17 05:25:17 ivan +# Revision 1.4 1999-01-18 09:41:15 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.3 1998/12/17 05:25:17 ivan # fix visual and other bugs # # Revision 1.2 1998/11/21 07:39:52 ivan @@ -33,7 +37,7 @@ my($cgi) = new CGI; &cgisuidsetup($cgi); my($p)=popurl(2); -print $cgi->header, header("Agent Type Listing", menubar( +print $cgi->header( '-expires' => 'now' ), header("Agent Type Listing", menubar( 'Main Menu' => $p, )), "Agent types define groups of packages that you can then assign to". " particular agents.

", table, <header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.3 1998/12/17 05:25:18 ivan # fix visual and other bugs # # Revision 1.2 1998/11/18 09:01:34 ivan @@ -31,7 +35,7 @@ my($cgi) = new CGI; my($p) = popurl(2); -print $cgi->header, header("Tax Rate Listing", menubar( +print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar( 'Main Menu' => $p, 'Edit tax rates' => $p. "edit/cust_main_county.cgi", )),<header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.4 1998/12/17 05:25:19 ivan # fix visual and other bugs # # Revision 1.3 1998/11/21 07:23:45 ivan @@ -36,7 +40,7 @@ my($cgi) = new CGI; my $p = popurl(2); -print $cgi->header, header("Package Part Listing",menubar( +print $cgi->header( '-expires' => 'now' ), header("Package Part Listing",menubar( 'Main Menu' => $p, )), "One or more services are grouped together into a package and given", " pricing information. Customers purchase packages, not services.

", diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi index b08efdbbc..859995af0 100755 --- a/htdocs/browse/part_referral.cgi +++ b/htdocs/browse/part_referral.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: part_referral.cgi,v 1.5 1998-12-17 05:25:20 ivan Exp $ +# $Id: part_referral.cgi,v 1.6 1999-01-18 09:41:18 ivan Exp $ # # ivan@sisd.com 98-feb-23 # @@ -10,7 +10,11 @@ # lose background, FS::CGI ivan@sisd.com 98-sep-2 # # $Log: part_referral.cgi,v $ -# Revision 1.5 1998-12-17 05:25:20 ivan +# Revision 1.6 1999-01-18 09:41:18 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.5 1998/12/17 05:25:20 ivan # fix visual and other bugs # # Revision 1.4 1998/12/17 04:32:55 ivan @@ -37,7 +41,7 @@ my $cgi = new CGI; my $p = popurl(2); -print $cgi->header, header("Referral Listing", menubar( +print $cgi->header( '-expires' => 'now' ), header("Referral Listing", menubar( 'Main Menu' => $p, # 'Add new referral' => "../edit/part_referral.cgi", )), "Where a customer heard about your service. Tracked for informational purposes.

", table, <header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.7 1998/12/30 23:06:22 ivan # typo # # Revision 1.6 1998/12/30 23:03:20 ivan @@ -43,7 +47,7 @@ my($cgi) = new CGI; my $p = popurl(2); -print $cgi->header, header('Service Part Listing', menubar( +print $cgi->header( '-expires' => 'now' ), header('Service Part Listing', menubar( 'Main Menu' => $p, )),<
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi index 2231aefe2..b172e78ea 100755 --- a/htdocs/browse/svc_acct_pop.cgi +++ b/htdocs/browse/svc_acct_pop.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 05:25:22 ivan Exp $ +# $Id: svc_acct_pop.cgi,v 1.4 1999-01-18 09:41:20 ivan Exp $ # # ivan@sisd.com 98-mar-8 # @@ -10,7 +10,11 @@ # lose background, FS::CGI ivan@sisd.com 98-sep-2 # # $Log: svc_acct_pop.cgi,v $ -# Revision 1.3 1998-12-17 05:25:22 ivan +# Revision 1.4 1999-01-18 09:41:20 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.3 1998/12/17 05:25:22 ivan # fix visual and other bugs # # Revision 1.2 1998/12/17 04:36:59 ivan @@ -31,7 +35,7 @@ my($cgi) = new CGI; my $p = popurl(2); -print $cgi->header, header('POP Listing', menubar( +print $cgi->header( '-expires' => 'now' ), header('POP Listing', menubar( 'Main Menu' => $p, )), "Points of Presence

", table, < diff --git a/htdocs/edit/agent.cgi b/htdocs/edit/agent.cgi index 44c1676b2..291f1b234 100755 --- a/htdocs/edit/agent.cgi +++ b/htdocs/edit/agent.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: agent.cgi,v 1.3 1998-12-17 06:16:57 ivan Exp $ +# $Id: agent.cgi,v 1.4 1999-01-18 09:41:21 ivan Exp $ # # ivan@sisd.com 97-dec-12 # @@ -11,7 +11,11 @@ # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12 # # $Log: agent.cgi,v $ -# Revision 1.3 1998-12-17 06:16:57 ivan +# Revision 1.4 1999-01-18 09:41:21 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.3 1998/12/17 06:16:57 ivan # fix double // in relative URLs, s/CGI::Base/CGI/; # # Revision 1.2 1998/11/23 07:52:08 ivan @@ -44,7 +48,7 @@ my($hashref)=$agent->hashref; my $p = popurl(2); -print $cgi->header, header("$action Agent", menubar( +print $cgi->header( '-expires' => 'now' ), header("$action Agent", menubar( 'Main Menu' => $p, 'View all agents' => $p. 'browse/agent.cgi', )), '
'; diff --git a/htdocs/edit/agent_type.cgi b/htdocs/edit/agent_type.cgi index 9bfc37429..b9da2a283 100755 --- a/htdocs/edit/agent_type.cgi +++ b/htdocs/edit/agent_type.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: agent_type.cgi,v 1.7 1999-01-18 09:22:29 ivan Exp $ +# $Id: agent_type.cgi,v 1.8 1999-01-18 09:41:22 ivan Exp $ # # agent_type.cgi: Add/Edit agent type (output form) # @@ -13,7 +13,11 @@ # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12 # # $Log: agent_type.cgi,v $ -# Revision 1.7 1999-01-18 09:22:29 ivan +# Revision 1.8 1999-01-18 09:41:22 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.7 1999/01/18 09:22:29 ivan # changes to track email addresses for email invoicing # # Revision 1.6 1998/12/17 06:16:58 ivan @@ -61,7 +65,7 @@ if ( $cgi->keywords ) { #editing my($hashref)=$agent_type->hashref; my($p)=popurl(2); -print $cgi->header, header("$action Agent Type", menubar( +print $cgi->header( '-expires' => 'now' ), header("$action Agent Type", menubar( 'Main Menu' => "$p", 'View all agent types' => "${p}browse/agent_type.cgi", )), ''; diff --git a/htdocs/edit/cust_credit.cgi b/htdocs/edit/cust_credit.cgi index 02b8008f7..4b7276f4b 100755 --- a/htdocs/edit/cust_credit.cgi +++ b/htdocs/edit/cust_credit.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: cust_credit.cgi,v 1.3 1998-12-23 02:26:06 ivan Exp $ +# $Id: cust_credit.cgi,v 1.4 1999-01-18 09:41:23 ivan Exp $ # # Usage: cust_credit.cgi custnum [ -paybatch ] # http://server.name/path/cust_credit?custnum [ -paybatch ] @@ -25,7 +25,11 @@ # rewrite ivan@sisd.com 98-mar-16 # # $Log: cust_credit.cgi,v $ -# Revision 1.3 1998-12-23 02:26:06 ivan +# Revision 1.4 1999-01-18 09:41:23 ivan +# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +# (good idea anyway) +# +# Revision 1.3 1998/12/23 02:26:06 ivan # *** empty log message *** # # Revision 1.2 1998/12/17 06:16:59 ivan @@ -51,7 +55,7 @@ my($otaker)=getotaker; my $p1 = popurl(1); -print $cgi->header, header("Post Credit", ''), <header( '-expires' => 'now' ), header("Post Credit", ''), < 
 END
diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index d712f7649..174c7986f 100755
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.5 1999-01-18 09:22:30 ivan Exp $
+# $Id: cust_main.cgi,v 1.6 1999-01-18 09:41:24 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -40,7 +40,11 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.5  1999-01-18 09:22:30  ivan
+# Revision 1.6  1999-01-18 09:41:24  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1999/01/18 09:22:30  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.4  1998/12/23 08:08:15  ivan
@@ -80,7 +84,7 @@ if ( $cgi->keywords ) { #editing
 # top
 
 my $p1 = popurl(1);
-print $cgi->header, header("Customer $action", ''),
+print $cgi->header( '-expires' => 'now' ), header("Customer $action", ''),
       qq!!,
       qq!!,
       qq!Customer # !, ( $custnum ? $custnum : " (NEW)" ),
diff --git a/htdocs/edit/cust_main_county-expand.cgi b/htdocs/edit/cust_main_county-expand.cgi
index eccb1d934..1b231bcec 100755
--- a/htdocs/edit/cust_main_county-expand.cgi
+++ b/htdocs/edit/cust_main_county-expand.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county-expand.cgi,v 1.3 1998-12-17 06:17:01 ivan Exp $
+# $Id: cust_main_county-expand.cgi,v 1.4 1999-01-18 09:41:25 ivan Exp $
 #
 # ivan@sisd.com 97-dec-16
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county-expand.cgi,v $
-# Revision 1.3  1998-12-17 06:17:01  ivan
+# Revision 1.4  1999-01-18 09:41:25  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:01  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/18 09:01:38  ivan
@@ -38,7 +42,7 @@ my($cust_main_county)=qsearchs('cust_main_county',{'taxnum'=>$taxnum});
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 my $p1 = popurl(1);
-print $cgi->header, header("Tax Rate (expand)", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 )), <
diff --git a/htdocs/edit/cust_main_county.cgi b/htdocs/edit/cust_main_county.cgi
index 537d5740a..7d5468bed 100755
--- a/htdocs/edit/cust_main_county.cgi
+++ b/htdocs/edit/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.3 1998-12-17 06:17:02 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.4 1999-01-18 09:41:26 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13-16
 #
@@ -11,7 +11,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # 
 # $Log: cust_main_county.cgi,v $
-# Revision 1.3  1998-12-17 06:17:02  ivan
+# Revision 1.4  1999-01-18 09:41:26  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 06:17:02  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 # Revision 1.2  1998/11/18 09:01:39  ivan
@@ -30,7 +34,7 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header, header("Edit tax rates", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 )), qq!!, table, <header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:03  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -33,7 +37,7 @@ $query =~ /^(\d+)$/;
 my($invnum)=$1;
 
 my $p1 = popurl(1);
-print $cgi->header, header("Enter payment", ''), <header( '-expires' => 'now' ), header("Enter payment", ''), <
     
 END
diff --git a/htdocs/edit/cust_pkg.cgi b/htdocs/edit/cust_pkg.cgi
index 68abf9698..763eeae07 100755
--- a/htdocs/edit/cust_pkg.cgi
+++ b/htdocs/edit/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.2 1998-12-17 06:17:04 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.3 1999-01-18 09:41:28 ivan Exp $
 #
 # this is for changing packages around, not editing things within the package
 #
@@ -25,7 +25,11 @@
 # 98-jun-1
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.2  1998-12-17 06:17:04  ivan
+# Revision 1.3  1999-01-18 09:41:28  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:04  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -55,7 +59,7 @@ my($custnum)=$1;
 my($otaker)=&getotaker;
 
 my $p1 = popurl(1);
-print $cgi->header, header("Add/Edit Packages", ''), <header( '-expires' => 'now' ), header("Add/Edit Packages", ''), <
     

 END
diff --git a/htdocs/edit/part_pkg.cgi b/htdocs/edit/part_pkg.cgi
index c30a85965..9870017ad 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.6 1998-12-17 06:17:05 ivan Exp $
+# $Id: part_pkg.cgi,v 1.7 1999-01-18 09:41:29 ivan Exp $
 #
 # part_pkg.cgi: Add/Edit package (output form)
 #
@@ -13,7 +13,11 @@
 # use FS::CGI, added inline documentation ivan@sisd.com 98-jul-12
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.6  1998-12-17 06:17:05  ivan
+# 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
@@ -70,7 +74,7 @@ if ( $cgi->param('clone') ) {
 }
 my($hashref)=$part_pkg->hashref;
 
-print $cgi->header, header("$action Package Definition", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 )), '';
diff --git a/htdocs/edit/part_referral.cgi b/htdocs/edit/part_referral.cgi
index 4eeec9982..e159e03ee 100755
--- a/htdocs/edit/part_referral.cgi
+++ b/htdocs/edit/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.2 1998-12-17 06:17:06 ivan Exp $
+# $Id: part_referral.cgi,v 1.3 1999-01-18 09:41:30 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23
 #
@@ -12,7 +12,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.2  1998-12-17 06:17:06  ivan
+# Revision 1.3  1999-01-18 09:41:30  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.2  1998/12/17 06:17:06  ivan
 # fix double // in relative URLs, s/CGI::Base/CGI/;
 #
 
@@ -39,7 +43,7 @@ if ( $cgi->var('QUERY_STRING') =~ /^(\d+)$/ ) { #editing
 my($hashref)=$part_referral->hashref;
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action Referral", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 )), <header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:21  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.4  1998/12/17 06:17:07  ivan
@@ -44,7 +48,7 @@ if ( $query && $query =~ /^(\d+)$/ ) { #editing
 my($hashref)=$part_svc->hashref;
 
 my $p = popurl(2);
-print $cgi->header, header("$action Service Definition", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action Service Definition", menubar(
   'Main Menu' => $p,
   'View all services' => "${p}browse/part_svc.cgi",
 )), '';
diff --git a/htdocs/edit/svc_acct.cgi b/htdocs/edit/svc_acct.cgi
index edb4a684e..e5cf4857c 100755
--- a/htdocs/edit/svc_acct.cgi
+++ b/htdocs/edit/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1998-12-30 23:03:22 ivan Exp $
+# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:41:32 ivan Exp $
 #
 # Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
@@ -18,7 +18,11 @@
 # use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1998-12-30 23:03:22  ivan
+# Revision 1.5  1999-01-18 09:41:32  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:22  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/17 06:17:08  ivan
@@ -108,7 +112,7 @@ my($ulen)=$svc_acct->dbdef_table->column('username')->length;
 my($ulen2)=$ulen+2;
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action $svc account"), <header( '-expires' => 'now' ), header("$action $svc account"), <
       
       
diff --git a/htdocs/edit/svc_acct_pop.cgi b/htdocs/edit/svc_acct_pop.cgi
index 4d41d0b32..e2c4bcdbe 100755
--- a/htdocs/edit/svc_acct_pop.cgi
+++ b/htdocs/edit/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.4 1998-12-23 02:57:45 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.5 1999-01-18 09:41:33 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8 
 #
@@ -10,7 +10,11 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.4  1998-12-23 02:57:45  ivan
+# Revision 1.5  1999-01-18 09:41:33  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 02:57:45  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 06:17:10  ivan
@@ -45,7 +49,7 @@ if ( $query =~ /^(\d+)$/ ) { #editing
 my($hashref)=$svc_acct_pop->hashref;
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action POP", menubar(
+print $cgi->header( '-expires' => 'now' ), header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.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
@@ -168,7 +172,7 @@ if ($pkgnum) {
 }
 
 my $p1 = popurl(1);
-print $cgi->header, header("Mail Alias $action", ''), <header( '-expires' => 'now' ), header("Mail Alias $action", ''), <
 END
 
diff --git a/htdocs/edit/svc_domain.cgi b/htdocs/edit/svc_domain.cgi
index 2937ccea0..d40f9001b 100755
--- a/htdocs/edit/svc_domain.cgi
+++ b/htdocs/edit/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.5 1998-12-30 23:03:25 ivan Exp $
+# $Id: svc_domain.cgi,v 1.6 1999-01-18 09:41:35 ivan Exp $
 #
 # Usage: svc_domain.cgi pkgnum{pkgnum}-svcpart{svcpart}
 #        http://server.name/path/svc_domain.cgi?pkgnum{pkgnum}-svcpart{svcpart}
@@ -17,7 +17,11 @@
 # no GOV in instructions ivan@sisd.com 98-jul-17
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.5  1998-12-30 23:03:25  ivan
+# Revision 1.6  1999-01-18 09:41:35  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/30 23:03:25  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.4  1998/12/23 03:00:16  ivan
@@ -96,7 +100,7 @@ my($domain)=(
 );
 
 my $p1 = popurl(1);
-print $cgi->header, header("$action $svc", ''), <header( '-expires' => 'now' ), header("$action $svc", ''), <
       
       
diff --git a/htdocs/misc/link.cgi b/htdocs/misc/link.cgi
index 6823365f5..d18cfccc1 100755
--- a/htdocs/misc/link.cgi
+++ b/htdocs/misc/link.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: link.cgi,v 1.3 1998-12-23 03:03:39 ivan Exp $
+# $Id: link.cgi,v 1.4 1999-01-18 09:41:36 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody
 #
@@ -11,7 +11,11 @@
 # can also link on some other fields now (about time) ivan@sisd.com 98-jun-24
 #
 # $Log: link.cgi,v $
-# Revision 1.3  1998-12-23 03:03:39  ivan
+# Revision 1.4  1999-01-18 09:41:36  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/23 03:03:39  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.2  1998/12/17 09:12:45  ivan
@@ -48,7 +52,7 @@ my($svc) = $part_svc->getfield('svc');
 my($svcdb) = $part_svc->getfield('svcdb');
 my($link_field) = $link_field{$svcdb};
 
-print $cgi->header, header("Link to existing $svc account"),
+print $cgi->header( '-expires' => 'now' ), header("Link to existing $svc account"),
       qq!!;
 
 if ( $link_field ) { 
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 262c1579c..48e88539b 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.4 1998-12-30 00:57:50 ivan Exp $
+# $Id: cust_main.cgi,v 1.5 1999-01-18 09:41:37 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
@@ -19,7 +19,11 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.4  1998-12-30 00:57:50  ivan
+# Revision 1.5  1999-01-18 09:41:37  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 00:57:50  ivan
 # bug
 #
 # Revision 1.3  1998/12/17 09:41:08  ivan
@@ -82,7 +86,7 @@ if ( scalar(@cust_main) == 1 ) {
 } else { 
 
   my($total)=scalar(@cust_main);
-  print $cgi->header, header("Customer Search Results",menubar(
+  print $cgi->header( '-expires' => 'now' ), header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found
", table, <
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index c198a56b6..248833ce1 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,15 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.4 1999-01-18 09:22:33 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.5 1999-01-18 09:41:38 ivan Exp $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
-# Revision 1.4  1999-01-18 09:22:33  ivan
+# Revision 1.5  1999-01-18 09:41:38  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1999/01/18 09:22:33  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.3  1998/12/23 03:05:59  ivan
@@ -68,7 +72,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   exit;
 } else {
   my($total)=scalar(@cust_pkg);
-  print $cgi->header, header('Package Search Results',''), <header( '-expires' => 'now' ), header('Package Search Results',''), <
       
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index 75fbcb9b7..5dd33a678 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.4 1999-01-18 09:22:34 ivan Exp $
+# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:41:39 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_acct.cgi
@@ -23,7 +23,11 @@
 # give service and customer info too ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.4  1999-01-18 09:22:34  ivan
+# Revision 1.5  1999-01-18 09:41:39  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1999/01/18 09:22:34  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.3  1998/12/23 03:06:28  ivan
@@ -90,7 +94,7 @@ if ( scalar(@svc_acct) == 1 ) {
   exit;
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header, header("Account Search Results",''), <header( '-expires' => 'now' ), header("Account Search Results",''), <
       
diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index 824a551c7..c1c593673 100755
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.3 1998-12-17 09:41:11 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.4 1999-01-18 09:41:40 ivan Exp $
 #
 # Usage: post form to:
 #        http://server.name/path/svc_domain.cgi
@@ -19,7 +19,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.3  1998-12-17 09:41:11  ivan
+# Revision 1.4  1999-01-18 09:41:40  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.3  1998/12/17 09:41:11  ivan
 # s/CGI::(Base|Request)/CGI.pm/;
 #
 
@@ -61,7 +65,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");  #redirect
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
   CGI::Base::SendHeaders();
-  print $cgi->header, header('Mail Alias Search Results'), table, <header( '-expires' => 'now' ), header('Mail Alias Search Results'), table, <
         Mail to
(click here to view mail alias)
         Forwards to
(click here to view account)
diff --git a/htdocs/view/cust_bill.cgi b/htdocs/view/cust_bill.cgi
index 80aab187f..ccfc33c81 100755
--- a/htdocs/view/cust_bill.cgi
+++ b/htdocs/view/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_bill.cgi,v 1.4 1998-12-30 23:03:33 ivan Exp $
+# $Id: cust_bill.cgi,v 1.5 1999-01-18 09:41:42 ivan Exp $
 #
 # Note: Should be run setuid freeside as user nobody.
 #
@@ -25,7 +25,11 @@
 # also print 'printed' field ivan@sisd.com 98-jul-10
 #
 # $Log: cust_bill.cgi,v $
-# Revision 1.4  1998-12-30 23:03:33  ivan
+# Revision 1.5  1999-01-18 09:41:42  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/30 23:03:33  ivan
 # bugfixes; fields isn't exported by derived classes
 #
 # Revision 1.3  1998/12/23 03:07:49  ivan
@@ -59,7 +63,7 @@ my($custnum) = $cust_bill->getfield('custnum');
 my($printed) = $cust_bill->printed;
 
 my $p = popurl(2);
-print $cgi->header, header('Invoice View', menubar(
+print $cgi->header( '-expires' => 'now' ), header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 )), <header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.8  1999/01/18 09:22:35  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.7  1998/12/30 23:03:34  ivan
@@ -75,7 +79,7 @@ use FS::cust_refund;
 my($cgi) = new CGI;
 &cgisuidsetup($cgi);
 
-print $cgi->header, header("Customer View", menubar(
+print $cgi->header( '-expires' => 'now' ), header("Customer View", menubar(
   'Main Menu' => popurl(2)
 )),<
diff --git a/htdocs/view/cust_pkg.cgi b/htdocs/view/cust_pkg.cgi
index b394da591..3f6eed614 100755
--- a/htdocs/view/cust_pkg.cgi
+++ b/htdocs/view/cust_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_pkg.cgi,v 1.5 1998-12-23 03:11:40 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.6 1999-01-18 09:41:44 ivan Exp $
 #
 # Usage: cust_pkg.cgi pkgnum
 #        http://server.name/path/cust_pkg.cgi?pkgnum
@@ -26,7 +26,11 @@
 # no FS::Search ivan@sisd.com 98-mar-7
 # 
 # $Log: cust_pkg.cgi,v $
-# Revision 1.5  1998-12-23 03:11:40  ivan
+# Revision 1.6  1999-01-18 09:41:44  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1998/12/23 03:11:40  ivan
 # *** empty log message ***
 #
 # Revision 1.3  1998/12/17 09:57:22  ivan
@@ -60,7 +64,7 @@ foreach $part_svc ( qsearch('part_svc',{}) ) {
   $uiadd{$part_svc->svcpart}= popurl(2). "edit/". $part_svc->svcdb . ".cgi";
 }
 
-print $cgi->header, header('Package View', '');
+print $cgi->header( '-expires' => 'now' ), header('Package View', '');
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 66ae2d1e9..1151e1ced 100755
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.cgi,v 1.5 1999-01-18 09:22:36 ivan Exp $
+# $Id: svc_acct.cgi,v 1.6 1999-01-18 09:41:45 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -35,7 +35,11 @@
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
 #
 # $Log: svc_acct.cgi,v $
-# Revision 1.5  1999-01-18 09:22:36  ivan
+# Revision 1.6  1999-01-18 09:41:45  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.5  1999/01/18 09:22:36  ivan
 # changes to track email addresses for email invoicing
 #
 # Revision 1.4  1998/12/23 03:09:19  ivan
@@ -86,7 +90,7 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header, header('Account View', '');
+print $cgi->header( '-expires' => 'now' ), header('Account View', '');
 
 my $p = popurl(2);
 if ($pkgnum || $custnum) {
diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index f30fb429b..ab8450fce 100755
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_sm.cgi,v 1.4 1998-12-23 03:09:52 ivan Exp $
+# $Id: svc_acct_sm.cgi,v 1.5 1999-01-18 09:41:46 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -22,7 +22,11 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # $Log: svc_acct_sm.cgi,v $
-# Revision 1.4  1998-12-23 03:09:52  ivan
+# Revision 1.5  1999-01-18 09:41:46  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 03:09:52  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 09:57:24  ivan
@@ -64,7 +68,7 @@ if ($pkgnum) {
 my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
-print $cgi->header, header('Mail Alias View');
+print $cgi->header( '-expires' => 'now' ), header('Mail Alias View');
 
 my $p = popurl(2);
 if ($pkgnum || $custnum) {
diff --git a/htdocs/view/svc_domain.cgi b/htdocs/view/svc_domain.cgi
index 9abeebbf4..7fa65e020 100755
--- a/htdocs/view/svc_domain.cgi
+++ b/htdocs/view/svc_domain.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_domain.cgi,v 1.4 1998-12-23 03:10:19 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1999-01-18 09:41:47 ivan Exp $
 #
 # Usage: svc_domain svcnum
 #        http://server.name/path/svc_domain.cgi?svcnum
@@ -15,7 +15,11 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: svc_domain.cgi,v $
-# Revision 1.4  1998-12-23 03:10:19  ivan
+# Revision 1.5  1999-01-18 09:41:47  ivan
+# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+# (good idea anyway)
+#
+# Revision 1.4  1998/12/23 03:10:19  ivan
 # $cgi->keywords instead of $cgi->query_string
 #
 # Revision 1.3  1998/12/17 09:57:25  ivan
@@ -55,7 +59,7 @@ my($part_svc)=qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unkonwn svcpart" unless $part_svc;
 
 my $p = popurl(2);
-print $cgi->header, header('Domain View', menubar(
+print $cgi->header( '-expires' => 'now' ), header('Domain View', menubar(
   "Main menu" => $p,
   "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index 136a05cf7..97dedaddf 100644
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -90,7 +90,7 @@ sub idiot {
     no strict 'subs';
     &CGI::Base::SendHeaders;
   } else {
-    print $cgi->header;
+    print $cgi->header( '-expires' => 'now' );
   }
   print <
@@ -193,7 +193,11 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 pod ivan@sisd.com 98-sep-12
 
 $Log: CGI.pm,v $
-Revision 1.14  1999-01-18 09:22:37  ivan
+Revision 1.15  1999-01-18 09:41:48  ivan
+all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
+(good idea anyway)
+
+Revision 1.14  1999/01/18 09:22:37  ivan
 changes to track email addresses for email invoicing
 
 Revision 1.12  1998/12/23 02:23:16  ivan
-- 
2.11.0