replace FS::CGI::header function with header-popup component, related to #71249

diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
index a96969f..dbe0990 100755 (executable)
--- a/httemplate/edit/msgcat.cgi
+++ b/httemplate/edit/msgcat.cgi
@@ -1,4 +1,4 @@
-<% header(emt("Edit Message catalog")) %>
+<& /elements/header-popup.html, emt("Edit Message catalog") &>
 <BR>
 
 <& /elements/error.html &>

diff --git a/httemplate/edit/process/bulk-cust_svc-pkgnum.html b/httemplate/edit/process/bulk-cust_svc-pkgnum.html
index 3c27306..36f4703 100644 (file)
--- a/httemplate/edit/process/bulk-cust_svc-pkgnum.html
+++ b/httemplate/edit/process/bulk-cust_svc-pkgnum.html
@@ -5,7 +5,7 @@
 %   errorpage_popup($error);
 % } else {
 
-    <% header(emt("Services moved")) %>
+    <& /elements/header-popup.html, emt("Services moved") &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>

diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html
index 54cafbf..5ca0c3c 100644 (file)
--- a/httemplate/edit/process/change-cust_pkg.html
+++ b/httemplate/edit/process/change-cust_pkg.html
@@ -3,7 +3,7 @@
 %   $cgi->redirect(popurl(3). 'misc/change_pkg.cgi?'. $cgi->query_string );
 % } else {
 
-    <% header(emt("Package changed")) %>
+    <& /elements/header-popup.html, emt("Package changed") &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>

diff --git a/httemplate/edit/process/cust_credit-pkgnum.html b/httemplate/edit/process/cust_credit-pkgnum.html
index 56f7989..559b932 100755 (executable)
--- a/httemplate/edit/process/cust_credit-pkgnum.html
+++ b/httemplate/edit/process/cust_credit-pkgnum.html
@@ -2,7 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'cust_credit-pkgnum.html?'. $cgi->query_string ) %>
 %} else {
-<% header(emt('Credit package changed')) %>
+<& /elements/header-popup.html, emt('Credit package changed') &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 5d30287..0b93c64 100755 (executable)
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -14,7 +14,7 @@
 %
 %  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 %  
-<% header(emt('Credit successful')) %>
+<& /elements/header-popup.html, emt('Credit successful') &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/edit/process/cust_location-censustract.html b/httemplate/edit/process/cust_location-censustract.html
index 6edaca3..f2daa89 100644 (file)
--- a/httemplate/edit/process/cust_location-censustract.html
+++ b/httemplate/edit/process/cust_location-censustract.html
@@ -3,7 +3,7 @@
 %   $cgi->redirect(popurl(3). 'edit/cust_location-censustract.html?'. $cgi->query_string );
 % } else {
 
-    <% header("Census tract changed") %>
+    <& /elements/header-popup.html, "Census tract changed" &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>

diff --git a/httemplate/edit/process/cust_location.cgi b/httemplate/edit/process/cust_location.cgi
index 3a23881..962b1a0 100644 (file)
--- a/httemplate/edit/process/cust_location.cgi
+++ b/httemplate/edit/process/cust_location.cgi
@@ -3,7 +3,7 @@
 %   $cgi->redirect(popurl(3). 'edit/cust_location.cgi?'. $cgi->query_string );
 % } else {
 
-    <% header("Location changed") %>
+    <& /elements/header-popup.html, emt("Location changed") &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>

diff --git a/httemplate/edit/process/cust_main_attach.cgi b/httemplate/edit/process/cust_main_attach.cgi
index 5695002..2935d68 100644 (file)
--- a/httemplate/edit/process/cust_main_attach.cgi
+++ b/httemplate/edit/process/cust_main_attach.cgi
@@ -7,7 +7,7 @@
 % $act = 'purged' if($attachnum and $purge);
 % $act = 'undeleted' if($attachnum and $undelete);
 % $act = 'deleted' if($attachnum and $delete);
-<% header('Attachment ' . $act ) %>
+<& /elements/header-popup.html, 'Attachment ' . $act  &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi
index bb52db8..2428689 100755 (executable)
--- a/httemplate/edit/process/cust_main_note.cgi
+++ b/httemplate/edit/process/cust_main_note.cgi
@@ -2,7 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'cust_main_note.cgi?'. $cgi->query_string ) %>
 %} else {
-<% header('Note ' . ($notenum ? 'updated' : 'added') ) %>
+<& /elements/header-popup.html, 'Note ' . ($notenum ? 'updated' : 'added')  &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/edit/process/cust_pay-pkgnum.html b/httemplate/edit/process/cust_pay-pkgnum.html
index cefe970..84288e4 100755 (executable)
--- a/httemplate/edit/process/cust_pay-pkgnum.html
+++ b/httemplate/edit/process/cust_pay-pkgnum.html
@@ -2,7 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'cust_pay-pkgnum.html?'. $cgi->query_string ) %>
 %} else {
-<% header(emt('Payment package changed')) %>
+<& /elements/header-popup.html, emt('Payment package changed') &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 15b26f9..50878f9 100755 (executable)
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -12,7 +12,7 @@
 %  }
 %  if ( $link eq 'popup' ) {
 %    
-<% header(emt('Payment entered')) %>
+<& /elements/header-popup.html, emt('Payment entered') &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/edit/process/cust_pkg_detail.html b/httemplate/edit/process/cust_pkg_detail.html
index 25fabd9..c0506dc 100644 (file)
--- a/httemplate/edit/process/cust_pkg_detail.html
+++ b/httemplate/edit/process/cust_pkg_detail.html
@@ -1,10 +1,10 @@
 % if ( $error ) {
-<% header('Error') %>
+<& /elements/header-popup.html, 'Error' &>
 <FONT COLOR="#ff0000"><B><% $error |h %></B></FONT><BR><BR>
 <CENTER><INPUT TYPE="BUTTON" VALUE="OK" onClick="parent.cClick()"></CENTER>
 </BODY></HTML>
 % } else {
-<% header($action) %>
+<& /elements/header-popup.html, $action &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/edit/process/cust_pkg_discount.html b/httemplate/edit/process/cust_pkg_discount.html
index 9635463..d0f93a6 100644 (file)
--- a/httemplate/edit/process/cust_pkg_discount.html
+++ b/httemplate/edit/process/cust_pkg_discount.html
@@ -3,7 +3,7 @@
 %   $cgi->redirect(popurl(3). 'edit/cust_pkg_discount.html?'. $cgi->query_string );
 % } else {
 
-    <% header("Discount applied") %>
+    <& /elements/header-popup.html, "Discount applied" &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>

diff --git a/httemplate/edit/process/cust_refund.cgi b/httemplate/edit/process/cust_refund.cgi
index d4236bc..5a4b327 100755 (executable)
--- a/httemplate/edit/process/cust_refund.cgi
+++ b/httemplate/edit/process/cust_refund.cgi
@@ -5,7 +5,7 @@
 %
 %  if ( $link eq 'popup' ) {
 %
-<% header('Refund entered') %>
+<& /elements/header-popup.html, 'Refund entered' &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/edit/process/cust_tax_adjustment.html b/httemplate/edit/process/cust_tax_adjustment.html
index fe23275..1b9ed01 100644 (file)
--- a/httemplate/edit/process/cust_tax_adjustment.html
+++ b/httemplate/edit/process/cust_tax_adjustment.html
@@ -2,7 +2,7 @@
 %   $cgi->param('error', $error );
 <% $cgi->redirect($p.'cust_tax_adjustment.html?'. $cgi->query_string) %>
 % } else {
-<% header("Tax adjustment added") %>
+<& /elements/header-popup.html, "Tax adjustment added" &>
   <SCRIPT TYPE="text/javascript">
     //topreload();
     parent.cClick();

diff --git a/httemplate/edit/process/detach-cust_pkg.html b/httemplate/edit/process/detach-cust_pkg.html
index 34c5805..3282030 100644 (file)
--- a/httemplate/edit/process/detach-cust_pkg.html
+++ b/httemplate/edit/process/detach-cust_pkg.html
@@ -3,7 +3,7 @@
 %   $cgi->redirect(popurl(3). 'misc/detach_pkg.html?'. $cgi->query_string );
 % } else {
 
-    <% header(emt("Package detached")) %>
+    <& /elements/header-popup.html, emt("Package detached") &>
       <SCRIPT TYPE="text/javascript">
         topreload();
       </SCRIPT>

diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi
index 9d869d5..66c75ba 100755 (executable)
--- a/httemplate/edit/process/domain_record.cgi
+++ b/httemplate/edit/process/domain_record.cgi
@@ -1,7 +1,7 @@
 %if ( $error ) {
 %  errorpage($error);
 %} elsif ( $recnum ) { #editing
-<% header('Nameservice record changed') %>
+<& /elements/header-popup.html, 'Nameservice record changed' &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/edit/process/elements/ApplicationCommon.html b/httemplate/edit/process/elements/ApplicationCommon.html
index 67fa891..ea2462a 100644 (file)
--- a/httemplate/edit/process/elements/ApplicationCommon.html
+++ b/httemplate/edit/process/elements/ApplicationCommon.html
@@ -24,7 +24,7 @@ Examples:
 %  my $query = $m->scomp('/elements/create_uri_query');
 <% $cgi->redirect(popurl(2). $opt{error_redirect}. "?$query") %>
 %} else {
-<% header("$src_thing application$to sucessful") %>
+<& /elements/header-popup.html, "$src_thing application$to sucessful" &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/edit/process/qual.cgi b/httemplate/edit/process/qual.cgi
index dd8d00b..2151654 100644 (file)
--- a/httemplate/edit/process/qual.cgi
+++ b/httemplate/edit/process/qual.cgi
@@ -2,7 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(3). 'misc/qual.html?'. $cgi->query_string ) %>
 %} else {
-<% header('Qualification entered') %>
+<& /elements/header-popup.html, 'Qualification entered' &>
   <SCRIPT TYPE="text/javascript">
     window.top.location = '<% popurl(3).'view/qual.cgi?qualnum='. $qual->qualnum %>';
   </SCRIPT>

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 5afddde..da5afe4 100644 (file)
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -20,7 +20,7 @@
 %      "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag";
 %  }
 % 
-<% header('Package ordered') %>
+<& /elements/header-popup.html, 'Package ordered' &>
   <SCRIPT TYPE="text/javascript">
     // XXX fancy ajax rebuild table at some point, but a page reload will do for now
 

diff --git a/httemplate/edit/process/quotation_pkg_detail.html b/httemplate/edit/process/quotation_pkg_detail.html
index 5728832..c1f9b2b 100644 (file)
--- a/httemplate/edit/process/quotation_pkg_detail.html
+++ b/httemplate/edit/process/quotation_pkg_detail.html
@@ -1,10 +1,10 @@
 % if ( $error ) {
-<% header('Error') %>
+<& /elements/header-popup.html, 'Error' &>
 <FONT COLOR="#ff0000"><B><% $error |h %></B></FONT><BR><BR>
 <CENTER><INPUT TYPE="BUTTON" VALUE="OK" onClick="parent.cClick()"></CENTER>
 </BODY></HTML>
 % } else {
-<% header($action) %>
+<& /elements/header-popup.html, $action &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/misc/delete-rate_detail.html b/httemplate/misc/delete-rate_detail.html
index b4d31b3..d75ebaa 100755 (executable)
--- a/httemplate/misc/delete-rate_detail.html
+++ b/httemplate/misc/delete-rate_detail.html
@@ -1,7 +1,7 @@
 % if ( $error ) {
 %   errorpage($error);
 % } else {
-<% header('Rate deleted') %>
+<& /elements/header-popup.html, 'Rate deleted' &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/misc/disable-cust_location.cgi b/httemplate/misc/disable-cust_location.cgi
index 677f0b8..886d836 100755 (executable)
--- a/httemplate/misc/disable-cust_location.cgi
+++ b/httemplate/misc/disable-cust_location.cgi
@@ -1,4 +1,4 @@
-<% header("Location disabled") %>
+<& /elements/header-popup.html, "Location disabled" &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/misc/process/bulk_pkg_increment_bill.cgi b/httemplate/misc/process/bulk_pkg_increment_bill.cgi
index 8da8495..d89f491 100755 (executable)
--- a/httemplate/misc/process/bulk_pkg_increment_bill.cgi
+++ b/httemplate/misc/process/bulk_pkg_increment_bill.cgi
@@ -2,7 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'bulk_pkg_increment_bill.cgi?'. $cgi->query_string ) %>
 %} else {
-<% header('Packages Adjusted') %>
+<& /elements/header-popup.html, 'Packages Adjusted' &>
     <SCRIPT TYPE="text/javascript">
       topreload();
     </SCRIPT>

diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index 46ba06a..b8be271 100755 (executable)
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -1,4 +1,4 @@
-<% header(emt("Package $past_method")) %>
+<& /elements/header-popup.html, emt("Package $past_method") &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/misc/process/change_pkg_contact.html b/httemplate/misc/process/change_pkg_contact.html
index 5bf8962..fdd42c2 100644 (file)
--- a/httemplate/misc/process/change_pkg_contact.html
+++ b/httemplate/misc/process/change_pkg_contact.html
@@ -1,4 +1,4 @@
-<% header(emt("Package contact $past_method")) %>
+<& /elements/header-popup.html, emt("Package contact $past_method") &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/misc/process/delay_susp_pkg.html b/httemplate/misc/process/delay_susp_pkg.html
index 15a3c96..006465c 100755 (executable)
--- a/httemplate/misc/process/delay_susp_pkg.html
+++ b/httemplate/misc/process/delay_susp_pkg.html
@@ -1,4 +1,4 @@
-<% header($msg) %>
+<& /elements/header-popup.html, $msg &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/misc/process/recharge_svc.html b/httemplate/misc/process/recharge_svc.html
index 88a1f7f..b8969a6 100755 (executable)
--- a/httemplate/misc/process/recharge_svc.html
+++ b/httemplate/misc/process/recharge_svc.html
@@ -2,7 +2,7 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). "recharge_svc.html?". $cgi->query_string ) %>
 %} else {
-<% header("Package recharged") %>
+<& /elements/header-popup.html, "Package recharged" &>
   <SCRIPT TYPE="text/javascript">
     topreload();
   </SCRIPT>

diff --git a/httemplate/misc/process/recharge_svc.new b/httemplate/misc/process/recharge_svc.new
index bc916e5..b73a76f 100755 (executable)
--- a/httemplate/misc/process/recharge_svc.new
+++ b/httemplate/misc/process/recharge_svc.new
@@ -75,7 +75,7 @@
 %}
 %$dbh->commit or die $dbh->errstr if $oldAutoCommit;
 %
-<% header("Package recharged") %>
+<& /elements/header-popup.html, "Package recharged" &>
   <SCRIPT TYPE="text/javascript">
     window.top.location.reload();
   </SCRIPT>