From c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 31 Jan 2006 04:26:54 +0000
Subject: [PATCH] move header() to include(/elements/header.html) so it can be
 changed in one place, thanks to Scott Edwards

---
 httemplate/browse/addr_block.cgi                     | 2 +-
 httemplate/browse/agent.cgi                          | 2 +-
 httemplate/browse/agent_type.cgi                     | 2 +-
 httemplate/browse/cust_pay_batch.cgi                 | 2 +-
 httemplate/browse/part_bill_event.cgi                | 2 +-
 httemplate/browse/part_export.cgi                    | 2 +-
 httemplate/browse/part_pkg.cgi                       | 2 +-
 httemplate/browse/part_referral.cgi                  | 2 +-
 httemplate/browse/part_svc.cgi                       | 2 +-
 httemplate/browse/part_virtual_field.cgi             | 2 +-
 httemplate/browse/payment_gateway.html               | 2 +-
 httemplate/browse/queue.cgi                          | 2 +-
 httemplate/browse/rate.cgi                           | 2 +-
 httemplate/browse/router.cgi                         | 2 +-
 httemplate/browse/svc_acct_pop.cgi                   | 2 +-
 httemplate/config/config-view.cgi                    | 2 +-
 httemplate/config/config.cgi                         | 2 +-
 httemplate/edit/REAL_cust_pkg.cgi                    | 2 +-
 httemplate/edit/agent.cgi                            | 2 +-
 httemplate/edit/agent_payment_gateway.html           | 2 +-
 httemplate/edit/agent_type.cgi                       | 2 +-
 httemplate/edit/bulk-cust_svc.html                   | 2 +-
 httemplate/edit/cust_pay.cgi                         | 2 +-
 httemplate/edit/part_export.cgi                      | 2 +-
 httemplate/edit/part_pkg.cgi                         | 2 +-
 httemplate/edit/part_svc.cgi                         | 2 +-
 httemplate/edit/payment_gateway.html                 | 2 +-
 httemplate/edit/prepay_credit.cgi                    | 2 +-
 httemplate/edit/process/prepay_credit.cgi            | 2 +-
 httemplate/edit/process/reg_code.cgi                 | 2 +-
 httemplate/edit/rate.cgi                             | 2 +-
 httemplate/edit/rate_region.cgi                      | 2 +-
 httemplate/edit/reg_code.cgi                         | 2 +-
 httemplate/edit/svc_acct.cgi                         | 2 +-
 httemplate/edit/svc_broadband.cgi                    | 2 +-
 httemplate/edit/svc_forward.cgi                      | 2 +-
 httemplate/misc/batch-cust_pay.html                  | 2 +-
 httemplate/misc/cust_main-import.cgi                 | 2 +-
 httemplate/misc/cust_main-import_charges.cgi         | 2 +-
 httemplate/misc/expire_pkg.cgi                       | 2 +-
 httemplate/misc/link.cgi                             | 2 +-
 httemplate/misc/meta-import.cgi                      | 2 +-
 httemplate/misc/process/cust_main-import.cgi         | 2 +-
 httemplate/misc/process/cust_main-import_charges.cgi | 2 +-
 httemplate/misc/process/meta-import.cgi              | 2 +-
 httemplate/misc/upload-batch.cgi                     | 2 +-
 httemplate/misc/whois.cgi                            | 2 +-
 httemplate/search/report_prepaid_income.cgi          | 2 +-
 httemplate/search/report_tax.cgi                     | 2 +-
 httemplate/search/svc_external.cgi                   | 2 +-
 httemplate/view/cust_bill.cgi                        | 2 +-
 httemplate/view/cust_main.cgi                        | 2 +-
 httemplate/view/svc_acct.cgi                         | 4 ++--
 httemplate/view/svc_broadband.cgi                    | 2 +-
 httemplate/view/svc_domain.cgi                       | 2 +-
 httemplate/view/svc_external.cgi                     | 2 +-
 56 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
index 06ac556cf..d453adf8e 100644
--- a/httemplate/browse/addr_block.cgi
+++ b/httemplate/browse/addr_block.cgi
@@ -1,4 +1,4 @@
-<%= header('Address Blocks', menubar('Main Menu'   => $p)) %>
+<%= include("/elements/header.html",'Address Blocks', menubar('Main Menu'   => $p)) %>
 <%
 
 use NetAddr::IP;
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index 05300d0bd..17cc8bd40 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -11,7 +11,7 @@
   my $conf = new FS::Conf;
 
 %>
-<%= header('Agent Listing', menubar(
+<%= include("/elements/header.html",'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 5473804e8..2e1bdad42 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Agent Type Listing", menubar(
+<%= include("/elements/header.html","Agent Type Listing", menubar(
   'Main Menu' => $p,
   'Agents'    => $p. 'browse/agent.cgi',
 )) %>
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 3420e97b6..0f05ecb25 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
+<%= include("/elements/header.html","Pending credit card batch", menubar( 'Main Menu' => $p,)) %>
 
 <FORM ACTION="<%=$p%>misc/download-batch.cgi" METHOD="POST">
 Download batch in format <SELECT NAME="format">
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 670474d48..5a89516df 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -12,7 +12,7 @@ my @part_bill_event = qsearch('part_bill_event', \%search );
 my $total = scalar(@part_bill_event);
 
 %>
-<%= header('Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
+<%= include("/elements/header.html",'Invoice Event Listing', menubar( 'Main Menu' => $p) ) %>
 
     Invoice events are actions taken on overdue invoices.<BR><BR>
 <A HREF="<%= $p %>edit/part_bill_event.cgi"><I>Add a new invoice event</I></A>
diff --git a/httemplate/browse/part_export.cgi b/httemplate/browse/part_export.cgi
index 79c57aefc..25a49cd20 100755
--- a/httemplate/browse/part_export.cgi
+++ b/httemplate/browse/part_export.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Export Listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
+<%= include("/elements/header.html","Export Listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
 Provisioning services to external machines, databases and APIs.<BR><BR>
 <A HREF="<%= $p %>edit/part_export.cgi"><I>Add a new export</I></A><BR><BR>
 <SCRIPT>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 8d5b55451..e6454639f 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -48,7 +48,7 @@ my $conf = new FS::Conf;
 my $taxclasses = $conf->exists('enable_taxclasses');
 
 %>
-<%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %>
+<%= include("/elements/header.html","Package Definition Listing",menubar( 'Main Menu' => $p )) %>
 <% unless ( $cgi->param('active') ) { %>
   One or more service definitions are grouped together into a package 
   definition and given pricing information.  Customers purchase packages
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 581e01bb6..238ddace7 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Advertising source Listing", menubar(
+<%= include("/elements/header.html","Advertising source Listing", menubar(
   'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
 )) %>
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index a725dc051..eef2676c0 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -28,7 +28,7 @@ if ( $cgi->param('orderby') eq 'active' ) {
 }
 
 %>
-<%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
+<%= include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
 
 <SCRIPT>
 function part_export_areyousure(href) {
diff --git a/httemplate/browse/part_virtual_field.cgi b/httemplate/browse/part_virtual_field.cgi
index a0009dabd..555798818 100644
--- a/httemplate/browse/part_virtual_field.cgi
+++ b/httemplate/browse/part_virtual_field.cgi
@@ -1,4 +1,4 @@
-<%= header('Virtual field definitions', menubar('Main Menu'   => $p)) %>
+<%= include("/elements/header.html",'Virtual field definitions', menubar('Main Menu'   => $p)) %>
 <%
 
 my %pvfs;
diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html
index bb7f31514..002932ccd 100644
--- a/httemplate/browse/payment_gateway.html
+++ b/httemplate/browse/payment_gateway.html
@@ -8,7 +8,7 @@
   }
 
 %>
-<%= header('Payment gateways', menubar(
+<%= include("/elements/header.html",'Payment gateways', menubar(
   'Main Menu' => $p,
   'Agents'    => $p. 'browse/agent.cgi',
 )) %>
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index 0afdd48d7..b865b1c30 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Job Queue", menubar( 'Main Menu' => $p, )) %>
+<%= include("/elements/header.html","Job Queue", menubar( 'Main Menu' => $p, )) %>
 <%= joblisting({}) %>
 </BODY>
 </HTML>
diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi
index c31260166..4718b7147 100644
--- a/httemplate/browse/rate.cgi
+++ b/httemplate/browse/rate.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header("Rate plan listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
+<%= include("/elements/header.html","Rate plan listing", menubar( 'Main Menu' => "$p#sysadmin" )) %>
 Rate plans, regions and prefixes for VoIP and call billing.<BR><BR>
 <A HREF="<%=$p%>edit/rate.cgi"><I>Add a rate plan</I></A>
 | <A HREF="<%=$p%>edit/rate_region.cgi"><I>Add a region</I></A>
diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 149db4903..410037d41 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -1,4 +1,4 @@
-<%= header('Routers', menubar('Main Menu'   => $p)) %>
+<%= include("/elements/header.html",'Routers', menubar('Main Menu'   => $p)) %>
 <%
 
 my @router = qsearch('router', {});
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 44cda81ad..73de6accc 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -4,7 +4,7 @@
                                      WHERE popnum = ?           ")
     or die dbh->errstr;
 %>
-<%= header('Access Number Listing', menubar( 'Main Menu' => $p )) %>
+<%= include("/elements/header.html",'Access Number Listing', menubar( 'Main Menu' => $p )) %>
 Points of Presence<BR><BR>
 <A HREF="<%= $p %>edit/svc_acct_pop.cgi"><I>Add new Access Number</I></A><BR><BR>
 <%= table() %>
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 8011e7697..bf51f1509 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('View Configuration', menubar( 'Main Menu' => $p,
+<%= include("/elements/header.html",'View Configuration', menubar( 'Main Menu' => $p,
                                      'Edit Configuration' => 'config.cgi' ) ) %>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index ff29d8578..21f79a9dc 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+<%= include("/elements/header.html",'Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 <SCRIPT>
 var gSafeOnload = new Array();
 var gSafeOnsubmit = new Array();
diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 78dd0fafa..1eefcfea0 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -33,7 +33,7 @@ if ( $error ) {
 #my $custnum = $cust_pkg->getfield('custnum');
 %>
 
-<%= header('Customer package - Edit dates') %>
+<%= include("/elements/header.html",'Customer package - Edit dates') %>
 <%
 #, menubar(
 #  "View this customer (#$custnum)" => popurl(2). "view/cust_main.cgi?$custnum",
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index cb64ad8cd..40115a932 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -19,7 +19,7 @@ my $conf = new FS::Conf;
 
 %>
 
-<%= header("$action Agent", menubar(
+<%= include("/elements/header.html","$action Agent", menubar(
   'Main Menu' => $p,
   'View all agents' => $p. 'browse/agent.cgi',
 )) %>
diff --git a/httemplate/edit/agent_payment_gateway.html b/httemplate/edit/agent_payment_gateway.html
index 61d29e0e9..db4331b84 100644
--- a/httemplate/edit/agent_payment_gateway.html
+++ b/httemplate/edit/agent_payment_gateway.html
@@ -12,7 +12,7 @@ my $action = 'Add';
 
 %>
 
-<%= header("$action payment gateway override for ". $agent->agent,  menubar(
+<%= include("/elements/header.html","$action payment gateway override for ". $agent->agent,  menubar(
   'Main Menu' => $p,
   #'View all payment gateways' => $p. 'browse/payment_gateway.html',
   'View all agents' => $p. 'browse/agent.html',
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index 5addbbd4c..944ddd0d0 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -16,7 +16,7 @@ my $action = $agent_type->typenum ? 'Edit' : 'Add';
 
 %>
 
-<%= header("$action Agent Type", menubar(
+<%= include("/elements/header.html","$action Agent Type", menubar(
   'Main Menu' => "$p",
   'View all agent types' => "${p}browse/agent_type.cgi",
 ))
diff --git a/httemplate/edit/bulk-cust_svc.html b/httemplate/edit/bulk-cust_svc.html
index 332b5b67c..be247ba4e 100644
--- a/httemplate/edit/bulk-cust_svc.html
+++ b/httemplate/edit/bulk-cust_svc.html
@@ -1,4 +1,4 @@
-<%= header( 'Bulk customer service change',
+<%= include("/elements/header.html", 'Bulk customer service change',
             menubar(
                      'Main Menu' => $p,
                    ),
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 0370ab726..94fd06ca5 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -45,7 +45,7 @@ $title .= " against Invoice #$linknum" if $link eq 'invnum';
 
 %>
 
-<%=  header($title, '') %>
+<%=  include("/elements/header.html",$title, '') %>
 
 <% if ( $cgi->param('error') ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index b3d42bd96..6a8a0deb6 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -100,7 +100,7 @@ my $widget = new HTML::Widgets::SelectLayers(
 );
 
 %>
-<%= header("$action Export", menubar(
+<%= include("/elements/header.html","$action Export", menubar(
   'Main Menu' => popurl(2),
 ), ' onLoad="visualize()"')
 %>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 60365f628..61e4086be 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -48,7 +48,7 @@ my $hashref = $part_pkg->hashref;
 
 %>
 
-<%= header("$action Package Definition", menubar(
+<%= include("/elements/header.html","$action Package Definition", menubar(
   'Main Menu' => popurl(2),
   'View all packages' => popurl(2). 'browse/part_pkg.cgi',
 )) %>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 9749fc12d..c5fff25e0 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -23,7 +23,7 @@ my $hashref = $part_svc->hashref;
 
            #" onLoad=\"visualize()\""
 %>
-<%= header("$action Service Definition",
+<%= include("/elements/header.html","$action Service Definition",
            menubar( 'Main Menu'         => $p,
                     'View all service definitions' => "${p}browse/part_svc.cgi"
                   ),
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index 33cc236d0..cf825df00 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -17,7 +17,7 @@ my $action = $payment_gateway->gatewaynum ? 'Edit' : 'Add';
 
 %>
 
-<%= header("$action Payment gateway", menubar(
+<%= include("/elements/header.html","$action Payment gateway", menubar(
   'Main Menu' => $p,
   'View all payment gateways' => $p. 'browse/payment_gateway.html',
 )) %>
diff --git a/httemplate/edit/prepay_credit.cgi b/httemplate/edit/prepay_credit.cgi
index 9cf0fc6e1..253edb94b 100644
--- a/httemplate/edit/prepay_credit.cgi
+++ b/httemplate/edit/prepay_credit.cgi
@@ -15,7 +15,7 @@ $cgi->param('multiplier', '60') unless $cgi->param('multiplier');
 
 %>
 
-<%= header('Generate prepaid cards'. ($agent ? ' for '. $agent->agent : ''),
+<%= include("/elements/header.html",'Generate prepaid cards'. ($agent ? ' for '. $agent->agent : ''),
            menubar( 'Main Menu' => $p, ))
 %>
 
diff --git a/httemplate/edit/process/prepay_credit.cgi b/httemplate/edit/process/prepay_credit.cgi
index 25ecbe079..ca7472432 100644
--- a/httemplate/edit/process/prepay_credit.cgi
+++ b/httemplate/edit/process/prepay_credit.cgi
@@ -29,7 +29,7 @@ unless ( ref($error) ) {
   $cgi->redirect(popurl(3). "edit/prepay_credit.cgi?". $cgi->query_string )
 %><% } else { %>
 
-<%= header( "$num prepaid cards generated".
+<%= include("/elements/header.html", "$num prepaid cards generated".
               ( $agent ? ' for '.$agent->agent : '' ),
             menubar( 'Main menu' => popurl(3) )
           )
diff --git a/httemplate/edit/process/reg_code.cgi b/httemplate/edit/process/reg_code.cgi
index 4658257f3..a86c7383a 100644
--- a/httemplate/edit/process/reg_code.cgi
+++ b/httemplate/edit/process/reg_code.cgi
@@ -28,7 +28,7 @@ unless ( ref($error) ) {
   $cgi->redirect(popurl(3). "edit/reg_code.cgi?". $cgi->query_string )
 %><% } else { %>
 
-<%= header("$num registration codes generated for ". $agent->agent, menubar(
+<%= include("/elements/header.html","$num registration codes generated for ". $agent->agent, menubar(
   'Main menu'       => popurl(3),
   'View all agents' => popurl(3). 'browse/agent.cgi',
 ) ) %>
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 1771f0105..f8f67f6c4 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -26,7 +26,7 @@ my %granularity = (
 
 %>
 
-<%= header("$action Rate plan", menubar(
+<%= include("/elements/header.html","$action Rate plan", menubar(
       'Main Menu' => $p,
       'View all rate plans' => "${p}browse/rate.cgi",
     ))
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index cc14dd37d..934fe8035 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -34,7 +34,7 @@ if ( @rate_prefix ) {
 
 %>
 
-<%= header("$action Region", menubar(
+<%= include("/elements/header.html","$action Region", menubar(
       'Main Menu' => $p,
       #'View all regions' => "${p}browse/rate_region.cgi",
     ))
diff --git a/httemplate/edit/reg_code.cgi b/httemplate/edit/reg_code.cgi
index 899d1ec45..2fba39e00 100644
--- a/httemplate/edit/reg_code.cgi
+++ b/httemplate/edit/reg_code.cgi
@@ -6,7 +6,7 @@ my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
 
 %>
 
-<%= header('Generate registration codes for '. $agent->agent, menubar(
+<%= include("/elements/header.html",'Generate registration codes for '. $agent->agent, menubar(
       'Main Menu' => $p,
     ))
 %>
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index e74d84d53..1e87c67ad 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -119,7 +119,7 @@ my $p1 = popurl(1);
 
 %>
 
-<%= header("$action $svc account") %>
+<%= include("/elements/header.html","$action $svc account") %>
 
 <% if ( $cgi->param('error') ) { %>
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 9e064c5c8..cbd0c2c3a 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -82,7 +82,7 @@ my ($ip_addr, $speed_up, $speed_down, $blocknum) =
 
 %>
 
-<%=header("Broadband Service $action", '')%>
+<%=include("/elements/header.html","Broadband Service $action", '')%>
 
 <% if ($cgi->param('error')) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT><BR>
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 2b9d35ad1..c1b90a9bd 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -110,7 +110,7 @@ my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
 
 %>
 
-<%= header("Mail Forward $action") %>
+<%= include("/elements/header.html","Mail Forward $action") %>
 
 <% if ( $cgi->param('error') ) { %>
   <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index 20cc89045..b40869476 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -1,4 +1,4 @@
-<%= header( 'Quick payment entry',
+<%= include("/elements/header.html", 'Quick payment entry',
             menubar(
                      'Main Menu' => $p, #popurl(1),
                      'Old-style quick payment entry' =>
diff --git a/httemplate/misc/cust_main-import.cgi b/httemplate/misc/cust_main-import.cgi
index 6b36f478d..484855005 100644
--- a/httemplate/misc/cust_main-import.cgi
+++ b/httemplate/misc/cust_main-import.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Batch Customer Import') %>
+<%= include("/elements/header.html",'Batch Customer Import') %>
 <FORM ACTION="process/cust_main-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
 Import a CSV file containing customer records.<BR><BR>
 Default file format is CSV, with the following field order: <i>cust_pkg.setup, dayphone, first, last, address1, address2, city, state, zip, comments</i><BR><BR>
diff --git a/httemplate/misc/cust_main-import_charges.cgi b/httemplate/misc/cust_main-import_charges.cgi
index 0822b9eb6..8402386d5 100644
--- a/httemplate/misc/cust_main-import_charges.cgi
+++ b/httemplate/misc/cust_main-import_charges.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Batch Customer Charge') %>
+<%= include("/elements/header.html",'Batch Customer Charge') %>
 <FORM ACTION="process/cust_main-import_charges.cgi" METHOD="post" ENCTYPE="multipart/form-data">
 Import a CSV file containing customer charges.<BR><BR>
 Default file format is CSV, with the following field order: <i>custnum, amount, description</i><BR><BR>
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index b59674a69..f8f69dafd 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -16,7 +16,7 @@ my $date = $cust_pkg->expire ? time2str('%D', $cust_pkg->expire) : '';
 
 %>
 
-<%= header('Expire package', menubar(
+<%= include("/elements/header.html",'Expire package', menubar(
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
   'Main Menu' => popurl(2)
 )) %>
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 18cd378d3..e2bdda7d5 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -31,7 +31,7 @@ my $link_field2 = $link_field2{$svcdb};
 
 %>
 
-<%= header("Link to existing $svc") %>
+<%= include("/elements/header.html","Link to existing $svc") %>
 <FORM ACTION="<%= popurl(1) %>process/link.cgi" METHOD=POST>
 
 <% if ( $link_field ) { %>
diff --git a/httemplate/misc/meta-import.cgi b/httemplate/misc/meta-import.cgi
index 2f3b7380d..b2fcfe450 100644
--- a/httemplate/misc/meta-import.cgi
+++ b/httemplate/misc/meta-import.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Import') %>
+<%= include("/elements/header.html",'Import') %>
 <FORM ACTION="process/meta-import.cgi" METHOD="post" ENCTYPE="multipart/form-data">
 Import data from a DBI data source<BR><BR>
 
diff --git a/httemplate/misc/process/cust_main-import.cgi b/httemplate/misc/process/cust_main-import.cgi
index 9e1adce54..2348ef680 100644
--- a/httemplate/misc/process/cust_main-import.cgi
+++ b/httemplate/misc/process/cust_main-import.cgi
@@ -25,6 +25,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import sucessful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/cust_main-import_charges.cgi b/httemplate/misc/process/cust_main-import_charges.cgi
index 14df1bd8d..c14228cf4 100644
--- a/httemplate/misc/process/cust_main-import_charges.cgi
+++ b/httemplate/misc/process/cust_main-import_charges.cgi
@@ -21,6 +21,6 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Import sucessful') %> <%
+    <%= include("/elements/header.html",'Import sucessful') %> <%
   }
 %>
diff --git a/httemplate/misc/process/meta-import.cgi b/httemplate/misc/process/meta-import.cgi
index 59d236f64..4cdecafc4 100644
--- a/httemplate/misc/process/meta-import.cgi
+++ b/httemplate/misc/process/meta-import.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Map tables') %>
+<%= include("/elements/header.html",'Map tables') %>
 
 <SCRIPT>
 var gSafeOnload = new Array();
diff --git a/httemplate/misc/upload-batch.cgi b/httemplate/misc/upload-batch.cgi
index 5d0150177..24d7cf15c 100644
--- a/httemplate/misc/upload-batch.cgi
+++ b/httemplate/misc/upload-batch.cgi
@@ -24,7 +24,7 @@
   } else {
     %>
     <!-- mason kludge -->
-    <%= header('Batch results upload sucessful') %> <%
+    <%= include("/elements/header.html",'Batch results upload sucessful') %> <%
   }
 %>
 
diff --git a/httemplate/misc/whois.cgi b/httemplate/misc/whois.cgi
index dd7851dc2..919add42a 100644
--- a/httemplate/misc/whois.cgi
+++ b/httemplate/misc/whois.cgi
@@ -4,7 +4,7 @@
   my $domain = $cgi->param('domain');
 
 %>
-<%= header("Whois $domain", menubar(
+<%= include("/elements/header.html","Whois $domain", menubar(
   ( $custnum
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index 1677591a3..f18224fd1 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -59,7 +59,7 @@
 
 %>
 
-<%= header( 'Prepaid Income (Unearned Revenue) Report',
+<%= include("/elements/header.html", 'Prepaid Income (Unearned Revenue) Report',
             menubar( 'Main Menu'=>$p, ) )               %>
 <%= table() %>
   <TR>
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 61ed26fac..0f33c4676 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -298,7 +298,7 @@ my $baselink   = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
 my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
 %>
 
-<%= header( "$agentname Sales Tax Report - ".
+<%= include("/elements/header.html", "$agentname Sales Tax Report - ".
               ( $beginning
                   ? time2str('%h %o %Y ', $beginning )
                   : ''
diff --git a/httemplate/search/svc_external.cgi b/httemplate/search/svc_external.cgi
index c5ac13498..8dbb949c8 100755
--- a/httemplate/search/svc_external.cgi
+++ b/httemplate/search/svc_external.cgi
@@ -48,7 +48,7 @@ if ( scalar(@svc_external) == 1 ) {
 } else {
 %>
 <!-- mason kludge -->
-<%= header("External Search Results",'') %>
+<%= include("/elements/header.html","External Search Results",'') %>
 
     <%= scalar(@svc_external) %> matching external services found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 56c0c1736..45e19d436 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -23,7 +23,7 @@ my $custnum = $cust_bill->getfield('custnum');
 my $link = $templatename ? "$templatename-$invnum" : $invnum;
 
 %>
-<%= header('Invoice View', menubar(
+<%= include("/elements/header.html",'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 59c1a4b73..4975c52fd 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -12,7 +12,7 @@ foreach my $part_svc ( qsearch('part_svc',{}) ) {
 
 %>
 
-<%= header("Customer View", menubar(
+<%= include("/elements/header.html","Customer View", menubar(
   'Main Menu' => $p,
 )) %>
 
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index b42362d91..f4f39084c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -37,7 +37,7 @@ my $domain = $svc_domain->domain;
 
 <% if ( $custnum ) { %>
 
-  <%= header("View $svc account", menubar(
+  <%= include("/elements/header.html","View $svc account", menubar(
     "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
     "Main menu" => $p,
   )) %>
@@ -54,7 +54,7 @@ my $domain = $svc_domain->domain;
   }
   </SCRIPT>
   
-  <%= header('Account View', menubar(
+  <%= include("/elements/header.html",'Account View', menubar(
     "Cancel this (unaudited) account" =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
     "Main menu" => $p,
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index f381b5ad3..263fd70f5 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -44,7 +44,7 @@ my (
    );
 %>
 
-<%=header('Broadband Service View', menubar(
+<%=include("/elements/header.html",'Broadband Service View', menubar(
   ( ( $custnum )
     ? ( "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 428f3e9bf..f39663094 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -32,7 +32,7 @@ my $domain = $svc_domain->domain;
 
 %>
 
-<%= header('Domain View', menubar(
+<%= include("/elements/header.html",'Domain View', menubar(
   ( ( $pkgnum || $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index 49183cd95..2acc3f9cf 100644
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -25,7 +25,7 @@ if ($pkgnum) {
 
 %>
 
-<%= header('External Service View', menubar(
+<%= include("/elements/header.html",'External Service View', menubar(
   ( ( $custnum )
     ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
-- 
2.11.0