From 4d5e45b24200386a7fc47f2cd69949e82e4bc9c3 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Thu, 15 Sep 2016 13:11:55 -0700 Subject: [PATCH] replace FS::CGI::header function with header-popup component, related to #71249 --- httemplate/edit/msgcat.cgi | 2 +- httemplate/edit/process/bulk-cust_svc-pkgnum.html | 2 +- httemplate/edit/process/change-cust_pkg.html | 2 +- httemplate/edit/process/cust_credit-pkgnum.html | 2 +- httemplate/edit/process/cust_credit.cgi | 2 +- httemplate/edit/process/cust_location-censustract.html | 2 +- httemplate/edit/process/cust_location.cgi | 2 +- httemplate/edit/process/cust_main_attach.cgi | 2 +- httemplate/edit/process/cust_main_note.cgi | 2 +- httemplate/edit/process/cust_pay-pkgnum.html | 2 +- httemplate/edit/process/cust_pay.cgi | 2 +- httemplate/edit/process/cust_pkg_detail.html | 4 ++-- httemplate/edit/process/cust_pkg_discount.html | 2 +- httemplate/edit/process/cust_refund.cgi | 2 +- httemplate/edit/process/cust_tax_adjustment.html | 2 +- httemplate/edit/process/detach-cust_pkg.html | 2 +- httemplate/edit/process/domain_record.cgi | 2 +- httemplate/edit/process/elements/ApplicationCommon.html | 2 +- httemplate/edit/process/qual.cgi | 2 +- httemplate/edit/process/quick-cust_pkg.cgi | 2 +- httemplate/edit/process/quotation_pkg_detail.html | 4 ++-- httemplate/misc/delete-rate_detail.html | 2 +- httemplate/misc/disable-cust_location.cgi | 2 +- httemplate/misc/process/bulk_pkg_increment_bill.cgi | 2 +- httemplate/misc/process/cancel_pkg.html | 2 +- httemplate/misc/process/change_pkg_contact.html | 2 +- httemplate/misc/process/delay_susp_pkg.html | 2 +- httemplate/misc/process/recharge_svc.html | 2 +- httemplate/misc/process/recharge_svc.new | 2 +- 29 files changed, 31 insertions(+), 31 deletions(-) diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi index a96969f2b..dbe0990d5 100755 --- 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") &>
<& /elements/error.html &> diff --git a/httemplate/edit/process/bulk-cust_svc-pkgnum.html b/httemplate/edit/process/bulk-cust_svc-pkgnum.html index 3c273069a..36f47035f 100644 --- 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") &> diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html index 54cafbf18..5ca0c3c0f 100644 --- 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") &> diff --git a/httemplate/edit/process/cust_credit-pkgnum.html b/httemplate/edit/process/cust_credit-pkgnum.html index 56f7989a4..559b93298 100755 --- 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') &> diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi index 5d3028777..0b93c64e5 100755 --- 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') &> diff --git a/httemplate/edit/process/cust_location-censustract.html b/httemplate/edit/process/cust_location-censustract.html index 6edaca3fd..f2daa89d0 100644 --- 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" &> diff --git a/httemplate/edit/process/cust_location.cgi b/httemplate/edit/process/cust_location.cgi index 3a2388111..962b1a075 100644 --- 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") &> diff --git a/httemplate/edit/process/cust_main_attach.cgi b/httemplate/edit/process/cust_main_attach.cgi index 569500246..2935d68a0 100644 --- 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 &> diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi index bb52db8f3..2428689c6 100755 --- 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') &> diff --git a/httemplate/edit/process/cust_pay-pkgnum.html b/httemplate/edit/process/cust_pay-pkgnum.html index cefe970fe..84288e47d 100755 --- 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') &> diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi index 15b26f9c6..50878f907 100755 --- 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') &> diff --git a/httemplate/edit/process/cust_pkg_detail.html b/httemplate/edit/process/cust_pkg_detail.html index 25fabd930..c0506dca6 100644 --- 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' &> <% $error |h %>

% } else { -<% header($action) %> +<& /elements/header-popup.html, $action &> diff --git a/httemplate/edit/process/cust_pkg_discount.html b/httemplate/edit/process/cust_pkg_discount.html index 963546363..d0f93a6c2 100644 --- 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" &> diff --git a/httemplate/edit/process/cust_refund.cgi b/httemplate/edit/process/cust_refund.cgi index d4236bcdf..5a4b3271f 100755 --- 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' &> diff --git a/httemplate/edit/process/cust_tax_adjustment.html b/httemplate/edit/process/cust_tax_adjustment.html index fe232757f..1b9ed01c3 100644 --- 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" &> diff --git a/httemplate/edit/process/domain_record.cgi b/httemplate/edit/process/domain_record.cgi index 9d869d547..66c75ba29 100755 --- 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' &> diff --git a/httemplate/edit/process/elements/ApplicationCommon.html b/httemplate/edit/process/elements/ApplicationCommon.html index 67fa89196..ea2462aed 100644 --- 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" &> diff --git a/httemplate/edit/process/qual.cgi b/httemplate/edit/process/qual.cgi index dd8d00b11..21516542c 100644 --- 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' &> diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi index 5afddde15..da5afe440 100644 --- 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' &> diff --git a/httemplate/misc/delete-rate_detail.html b/httemplate/misc/delete-rate_detail.html index b4d31b379..d75ebaa23 100755 --- 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' &> diff --git a/httemplate/misc/disable-cust_location.cgi b/httemplate/misc/disable-cust_location.cgi index 677f0b891..886d8369c 100755 --- 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" &> diff --git a/httemplate/misc/process/bulk_pkg_increment_bill.cgi b/httemplate/misc/process/bulk_pkg_increment_bill.cgi index 8da849508..d89f49120 100755 --- 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' &> diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html index 46ba06a6d..b8be27113 100755 --- 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") &> diff --git a/httemplate/misc/process/change_pkg_contact.html b/httemplate/misc/process/change_pkg_contact.html index 5bf896200..fdd42c236 100644 --- 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") &> diff --git a/httemplate/misc/process/delay_susp_pkg.html b/httemplate/misc/process/delay_susp_pkg.html index 15a3c963c..006465ca7 100755 --- 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 &> diff --git a/httemplate/misc/process/recharge_svc.html b/httemplate/misc/process/recharge_svc.html index 88a1f7f36..b8969a6e5 100755 --- 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" &> diff --git a/httemplate/misc/process/recharge_svc.new b/httemplate/misc/process/recharge_svc.new index bc916e5da..b73a76fb1 100755 --- 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" &> -- 2.11.0