From c14a267229fc0d6f2d2afdebab3bd34d825df2ef Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:54:07 +0000
Subject: [PATCH] get rid of header foo in individual templates

---
 htetc/handler.pl                            | 2 +-
 httemplate/browse/agent.cgi                 | 4 ++--
 httemplate/browse/agent_type.cgi            | 4 ++--
 httemplate/browse/cust_main_county.cgi      | 4 ++--
 httemplate/browse/nas.cgi                   | 2 +-
 httemplate/browse/part_pkg.cgi              | 4 ++--
 httemplate/browse/part_referral.cgi         | 4 ++--
 httemplate/browse/queue.cgi                 | 4 ++--
 httemplate/browse/svc_acct_pop.cgi          | 4 ++--
 httemplate/edit/agent.cgi                   | 4 ++--
 httemplate/edit/agent_type.cgi              | 4 ++--
 httemplate/edit/cust_credit.cgi             | 4 ++--
 httemplate/edit/cust_credit_bill.cgi        | 4 ++--
 httemplate/edit/cust_main.cgi               | 4 ++--
 httemplate/edit/cust_main_county-expand.cgi | 4 ++--
 httemplate/edit/cust_main_county.cgi        | 4 ++--
 httemplate/edit/cust_pay.cgi                | 4 ++--
 httemplate/edit/cust_pkg.cgi                | 4 ++--
 httemplate/edit/part_referral.cgi           | 4 ++--
 httemplate/edit/svc_acct.cgi                | 4 ++--
 httemplate/edit/svc_acct_pop.cgi            | 4 ++--
 httemplate/edit/svc_acct_sm.cgi             | 4 ++--
 httemplate/edit/svc_domain.cgi              | 4 ++--
 httemplate/edit/svc_forward.cgi             | 4 ++--
 httemplate/misc/catchall.cgi                | 4 ++--
 httemplate/misc/delete-customer.cgi         | 4 ++--
 httemplate/misc/link.cgi                    | 4 ++--
 httemplate/search/cust_bill.cgi             | 5 ++---
 httemplate/search/cust_main.cgi             | 4 ++--
 httemplate/search/cust_pkg.cgi              | 5 ++---
 httemplate/search/svc_acct.cgi              | 5 ++---
 httemplate/search/svc_acct_sm.cgi           | 6 ++----
 httemplate/search/svc_domain.cgi            | 5 ++---
 httemplate/view/cust_bill.cgi               | 4 ++--
 httemplate/view/cust_main.cgi               | 4 ++--
 httemplate/view/cust_pkg.cgi                | 4 ++--
 httemplate/view/svc_acct.cgi                | 4 ++--
 httemplate/view/svc_acct_sm.cgi             | 4 ++--
 httemplate/view/svc_domain.cgi              | 4 ++--
 httemplate/view/svc_forward.cgi             | 4 ++--
 40 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/htetc/handler.pl b/htetc/handler.pl
index d10ecc918..e643559f0 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -77,7 +77,7 @@ sub handler
     $r->content_type('text/html');
     #eorar
 
-    # @FS::CGI::@headers or some other way to set no-cache headers!!!
+    # @FS::CGI::headers or some other way to set no-cache headers!!!
     
     my $status = $ah->handle_request($r);
     
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 0f51d00de..62004490f 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $ui $cgi $p $agent );
@@ -28,7 +28,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header('Agent Listing', menubar(
+print header('Agent Listing', menubar(
   'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index d1f8c6e6e..11ba20ac5 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $agent_type );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 &cgisuidsetup($cgi);
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header("Agent Type Listing", menubar(
+print header("Agent Type Listing", menubar(
   'Main Menu' => $p,
 )), "Agent types define groups of packages that you can then assign to".
     " particular agents.<BR><BR>", &table(), <<END;
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 7db581f6c..bbd75cc4a 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $cust_main_county );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Tax Rate Listing", menubar(
+print header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
   'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 5125bacb7..6df40e049 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p=popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header('NAS ports', menubar(
+print header('NAS ports', menubar(
   'Main Menu' => $p,
 ));
 
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 9a699d5ef..e0d25f67d 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_pkg.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_pkg.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_pkg );
@@ -18,7 +18,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Package Definition Listing",menubar(
+print header("Package Definition Listing",menubar(
   'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages",
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 6481b6668..b82d4cba0 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $part_referral );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Referral Listing", menubar(
+print 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.<BR><BR>", &table(), <<END;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index ba695738b..72643eb47 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: queue.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: queue.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p ); # $part_referral );
@@ -17,7 +17,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("Job Queue", menubar(
+print header("Job Queue", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )), &table(), <<END;
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index e5a611763..21cb95f89 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $p $svc_acct_pop );
@@ -16,7 +16,7 @@ $cgi = new CGI;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header('POP Listing', menubar(
+print header('POP Listing', menubar(
   'Main Menu' => $p,
 )), "Points of Presence<BR><BR>", &table(), <<END;
       <TR>
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index ea68b4768..a4dcda5e3 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $agent $action $hashref $p $agent_type );
@@ -31,7 +31,7 @@ $hashref = $agent->hashref;
 
 $p = popurl(2);
 
-print $cgi->header( @FS::CGI::header ), header("$action Agent", menubar(
+print header("$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 ));
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index eba2c2305..849da8113 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: agent_type.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: agent_type.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $agent_type $action $hashref $p $part_pkg );
@@ -32,7 +32,7 @@ $action = $agent_type->typenum ? 'Edit' : 'Add';
 $hashref = $agent_type->hashref;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header("$action Agent Type", menubar(
+print header("$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ));
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 3bfbfc8c4..5d5f5b296 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_credit.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $otaker $p1 $crednum $_date $amount $reason );
@@ -36,7 +36,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( @FS::CGI::header ), header("Post Credit", '');
+print header("Post Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index d2d50cbf6..2b41cc216 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_credit_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_credit_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $custnum $invnum $otaker $p1 $crednum $amount $reason $cust_credit );
@@ -38,7 +38,7 @@ $otaker = getotaker;
 
 $p1 = popurl(1);
 
-print $cgi->header( @FS::CGI::header ), header("Apply Credit", '');
+print header("Apply Credit", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
   if $cgi->param('error');
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f5662fd87..d8191c7d6 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.8 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.9 2001-10-30 14:54:07 ivan Exp $ -->
 
 use vars qw( $cgi $custnum $action $cust_main $p1 @agents $agentnum 
              $last $first $ss $company $address1 $address2 $city $zip 
@@ -74,7 +74,7 @@ $action = $custnum ? 'Edit' : 'Add';
 # top
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Customer $action", '');
+print header("Customer $action", '');
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $error, "</FONT>"
   if $error;
 
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index c344e91ae..f5dc32372 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county-expand.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
@@ -32,7 +32,7 @@ $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
 die "Can't expand entry!" if $cust_main_county->getfield('county');
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Tax Rate (expand)", menubar(
+print header("Tax Rate (expand)", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index c25b6edd0..f88601281 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main_county.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $cust_main_county );
@@ -14,7 +14,7 @@ $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
-print $cgi->header( @FS::CGI::header ), header("Edit tax rates", menubar(
+print header("Edit tax rates", menubar(
   'Main Menu' => popurl(2),
 ));
 
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index a9506c8ed..3c0dbb2fe 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pay.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_pay.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $link $linknum $p1 $_date $payby $payinfo $paid );
@@ -38,7 +38,7 @@ if ( $cgi->param('error') ) {
 $_date = time;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Enter payment", '');
+print header("Enter payment", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index ea92ac05e..7d5bb3fd3 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_pkg.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_pkg.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi %pkg %comment $custnum $p1 @cust_pkg 
@@ -33,7 +33,7 @@ if ( $cgi->param('error') ) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Add/Edit Packages", '');
+print header("Add/Edit Packages", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 06f416903..09344b956 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: part_referral.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: part_referral.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $part_referral $action $hashref $p1 $query );
@@ -29,7 +29,7 @@ $action = $part_referral->refnum ? 'Edit' : 'Add';
 $hashref = $part_referral->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action Referral", menubar(
+print header("$action Referral", menubar(
   'Main Menu' => popurl(2),
   'View all referrals' => popurl(2). "browse/part_referral.cgi",
 ));
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 8a558613e..4911e0ffd 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
@@ -101,7 +101,7 @@ $ulen = $svc_acct->dbdef_table->column('username')->length;
 $ulen2 = $ulen+2;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action $svc account");
+print header("$action $svc account");
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT><BR><BR>"
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index 3ba0f1439..23caa794b 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_pop.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_pop.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $svc_acct_pop $action $query $hashref $p1 );
@@ -27,7 +27,7 @@ $action = $svc_acct_pop->popnum ? 'Edit' : 'Add';
 $hashref = $svc_acct_pop->hashref;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action POP", menubar(
+print header("$action POP", menubar(
   'Main Menu' => popurl(2),
   'View all POPs' => popurl(2). "browse/svc_acct_pop.cgi",
 ));
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 4497b5f59..baf0a7eb2 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 }
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Mail Alias $action", '');
+print header("Mail Alias $action", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 971088d21..713b2ccd7 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_domain.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_domain.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $action $svcnum $svc_domain $pkgnum $svcpart $part_svc
@@ -77,7 +77,7 @@ $otaker = getotaker;
 $domain = $svc_domain->domain;
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("$action $svc", '');
+print header("$action $svc", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 0529c2b86..caf6ee76d 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $action $svcnum $svc_forward $pkgnum $svcpart
@@ -128,7 +128,7 @@ if ($pkgnum) {
 #display
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Mail Forward $action", '',
+print header("Mail Forward $action", '',
       " onLoad=\"visualize()\"");
 
 %>
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 7e90ac4e0..3aafd0d49 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: catchall.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: catchall.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $action $svcnum $svc_domain $pkgnum $svcpart
@@ -94,7 +94,7 @@ if ($pkgnum) {
 $email{0} = "(none)";
 
 $p1 = popurl(1);
-print $cgi->header( @FS::CGI::header ), header("Domain Catchall Edit", '');
+print header("Domain Catchall Edit", '');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index ec1f734f1..d3e7c798f 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: delete-customer.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: delete-customer.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $conf $query $custnum $new_custnum $cust_main );
@@ -28,7 +28,7 @@ if ( $cgi->param('error') ) {
 $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } )
   or die "Customer not found: $custnum";
 
-print $cgi->header ( @FS::CGI::header ), header('Delete customer');
+print header('Delete customer');
 
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
       "</FONT>"
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index cd873cc8d..801b92006 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: link.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: link.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( %link_field $cgi $pkgnum $svcpart $query $part_svc $svc $svcdb 
@@ -32,7 +32,7 @@ $svc = $part_svc->getfield('svc');
 $svcdb = $part_svc->getfield('svcdb');
 $link_field = $link_field{$svcdb};
 
-print $cgi->header( @FS::CGI::header ), header("Link to existing $svc"),
+print header("Link to existing $svc"),
       qq!<FORM ACTION="!, popurl(1), qq!process/link.cgi" METHOD=POST>!;
 
 if ( $link_field ) { 
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 02dbf558f..41a4a546e 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $invnum $query $sortby @cust_bill );
@@ -67,8 +67,7 @@ if ( scalar(@cust_bill) == 1 ) {
   eidiot("Invoice not found.");
 } else {
   my $total = scalar(@cust_bill);
-  print $cgi->header( @FS::CGI::header ),
-        &header("Invoice Search Results", menubar(
+  print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
         )), "$total matching invoices found<BR>", &table(), <<END;
       <TR>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d8cd0a072..a11892101 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.11 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.12 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby );
@@ -59,7 +59,7 @@ if ( scalar(@cust_main) == 1 && ! $cgi->param('referral_custnum') ) {
 } else { 
 
   my($total)=scalar(@cust_main);
-  print $cgi->header( @FS::CGI::header ), header("Customer Search Results",menubar(
+  print header("Customer Search Results",menubar(
     'Main Menu', popurl(2)
   )), "$total matching customers found ";
   if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index f7cb50674..93ce7ae29 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.6 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @cust_pkg $sortby $query %part_pkg );
@@ -58,8 +58,7 @@ if ( scalar(@cust_pkg) == 1 ) {
   eidiot("No packages found");
 } else {
   my($total)=scalar(@cust_pkg);
-  print $cgi->header( @FS::CGI::header ),
-        header('Package Search Results',''),
+  print header('Package Search Results',''),
         "$total matching packages found<BR>", &table(), <<END;
       <TR>
         <TH>Package</TH>
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 5fc815453..fb970e966 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi @svc_acct $sortby $query $mydomain );
@@ -59,8 +59,7 @@ if ( scalar(@svc_acct) == 1 ) {
   idiot("Account not found");
 } else {
   my($total)=scalar(@svc_acct);
-  print $cgi->header( @FS::CGI::header ),
-        header("Account Search Results",''),
+  print header("Account Search Results",''),
         "$total matching accounts found",
         &table(), <<END;
       <TR>
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 24b304051..5250b5ca1 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $mydomain $domuser $svc_domain $domsvc @svc_acct_sm );
@@ -40,9 +40,7 @@ if ( scalar(@svc_acct_sm) == 1 ) {
   my($svcnum)=$svc_acct_sm[0]->svcnum;
   print $cgi->redirect(popurl(2). "view/svc_acct_sm.cgi?$svcnum");
 } elsif ( scalar(@svc_acct_sm) > 1 ) {
-  print $cgi->header( @FS::CGI::header ),
-        header('Mail Alias Search Results'),
-        &table(), <<END;
+  print header('Mail Alias Search Results'), &table(), <<END;
       <TR>
         <TH>Mail to<BR><FONT SIZE=-1>(click to view mail alias)</FONT></TH>
         <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 1b80e5b32..b09c65a0b 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
@@ -54,8 +54,7 @@ if ( scalar(@svc_domain) == 1 ) {
 } else {
 
   my($total)=scalar(@svc_domain);
-  print $cgi->header( @FS::CGI::header ),
-        header("Domain Search Results",''), <<END;
+  print header("Domain Search Results",''), <<END;
 
     $total matching domains found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 57193197e..bbcf87fc2 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_bill.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: cust_bill.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $invnum $cust_bill $custnum $printed $p );
@@ -26,7 +26,7 @@ $custnum = $cust_bill->getfield('custnum');
 $printed = $cust_bill->printed;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Invoice View', menubar(
+print header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
 ));
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 7deaeb9f4..d43575a9a 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: cust_main.cgi,v 1.13 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: cust_main.cgi,v 1.14 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi $query $custnum $cust_main $hashref $agent $referral 
@@ -29,7 +29,7 @@ $cgi = new CGI;
 
 $conf = new FS::Conf;
 
-print $cgi->header( @FS::CGI::header ), header("Customer View", menubar(
+print header("Customer View", menubar(
   'Main Menu' => popurl(2)
 ));
 
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 5ddb17aee..c8b362cc3 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: cust_pkg.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: cust_pkg.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw ( $cgi %uiview %uiadd $part_svc $query $pkgnum $cust_pkg $part_pkg
@@ -35,7 +35,7 @@ die "No package!" unless $cust_pkg;
 $part_pkg = qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->getfield('pkgpart')});
 
 $custnum = $cust_pkg->getfield('custnum');
-print $cgi->header( @FS::CGI::header ), header('Package View', menubar(
+print header('Package View', menubar(
   "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
   'Main Menu' => popurl(2)
 ));
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e4c328f1f..23205ece9 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_acct.cgi,v 1.7 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_acct.cgi,v 1.8 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
@@ -55,7 +55,7 @@ if ( $svc_acct->domsvc ) {
 }
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Account View', menubar(
+print header('Account View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index 2a69c858f..366ee99f9 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,5 +1,5 @@
 <%
-#<!-- $Id: svc_acct_sm.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+#<!-- $Id: svc_acct_sm.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc
@@ -43,7 +43,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Mail Alias View', menubar(
+print header('Mail Alias View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index 81b5922f8..4add200b9 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.4 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_domain.cgi,v 1.5 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw( $cgi $query $svcnum $svc_domain $domain $cust_svc $pkgnum 
@@ -44,7 +44,7 @@ if ($svc_domain->catchall) {
 $domain = $svc_domain->domain;
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Domain View', menubar(
+print header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 4a636c60e..bb9587062 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,5 +1,5 @@
 <%
-# <!-- $Id: svc_forward.cgi,v 1.3 2001-10-26 10:24:56 ivan Exp $ -->
+# <!-- $Id: svc_forward.cgi,v 1.4 2001-10-30 14:54:07 ivan Exp $ -->
 
 use strict;
 use vars qw($conf $cgi $query $svcnum $svc_forward $cust_svc
@@ -41,7 +41,7 @@ $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
   or die "Unkonwn svcpart";
 
 $p = popurl(2);
-print $cgi->header( @FS::CGI::header ), header('Mail Forward View', menubar(
+print header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
         "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-- 
2.11.0