[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 4e0af9b29e994900a0e7ace25fdc70241bdbe4b6
Mark Wells
mark at 420.am
Thu Feb 14 14:27:52 PST 2013
The branch, FREESIDE_2_3_BRANCH has been updated
via 4e0af9b29e994900a0e7ace25fdc70241bdbe4b6 (commit)
from 2d5e3634cd4b4e8a80a41e1efb54ed0959c9a64b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4e0af9b29e994900a0e7ace25fdc70241bdbe4b6
Author: Mark Wells <mark at freeside.biz>
Date: Thu Feb 14 14:17:46 2013 -0800
include elements/search.html the right way to avoid problems with XLS download, #21421
diff --git a/httemplate/browse/elements/browse.html b/httemplate/browse/elements/browse.html
index 9099d65..21058ce 100644
--- a/httemplate/browse/elements/browse.html
+++ b/httemplate/browse/elements/browse.html
@@ -1,6 +1,5 @@
-<% include( '/search/elements/search.html',
+<& /search/elements/search.html,
'really_disable_download' => 1,
'disable_nonefound' => 1,
@_,
- )
-%>
+&>
diff --git a/httemplate/search/477partIA_detail.html b/httemplate/search/477partIA_detail.html
index 66f3a86..666032d 100755
--- a/httemplate/search/477partIA_detail.html
+++ b/httemplate/search/477partIA_detail.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'html_init' => $html_init,
'name' => 'lines',
'query' => $query,
@@ -11,8 +11,8 @@
'xml_elements' => [ @xml_elements ],
'xml_omit_empty' => 1,
'fields' => [ @fields ],
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/477partIA_summary.html b/httemplate/search/477partIA_summary.html
index f5c2bc2..ebf081c 100755
--- a/httemplate/search/477partIA_summary.html
+++ b/httemplate/search/477partIA_summary.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'html_init' => $html_init,
'name' => 'lines',
'query' => 'SELECT 1',
@@ -28,8 +28,8 @@
sub { $total_percentage },
sub { $above_200_percentage },
],
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/477partIIA.html b/httemplate/search/477partIIA.html
index d2cc8c3..6a53229 100755
--- a/httemplate/search/477partIIA.html
+++ b/httemplate/search/477partIIA.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'html_init' => $html_init,
'name' => 'lines',
'query' => $query,
@@ -10,8 +10,8 @@
'header' => [ @headers ],
'xml_elements' => [ @xml_elements ],
'fields' => [ @fields ],
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/477partV.html b/httemplate/search/477partV.html
index 2b20bc7..57f80e6 100755
--- a/httemplate/search/477partV.html
+++ b/httemplate/search/477partV.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'html_init' => $html_init,
'name' => 'zip code',
'query' => $sql_query,
@@ -12,8 +12,8 @@
'url' => $opt{url} || '',
'really_disable_download' => 1,
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html
index cb8cf23..b6a2136 100755
--- a/httemplate/search/477partVI_census.html
+++ b/httemplate/search/477partVI_census.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'html_init' => '<H2>Part VI</H2>',
'html_foot' => $html_foot,
'name' => 'regions',
@@ -24,8 +24,8 @@
'url' => $opt{url} || '',
'xml_row_element' => 'Datarow',
'really_disable_download' => 1,
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/agent_inventory.html b/httemplate/search/agent_inventory.html
index ac65371..015aca4 100644
--- a/httemplate/search/agent_inventory.html
+++ b/httemplate/search/agent_inventory.html
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => 'Inventory summary per agent',
'name_singular' => 'agent',
'query' => { 'table' => 'agent',
@@ -10,8 +10,7 @@
" AND $agentnums_sql",
'header' => \@header,
'fields' => \@fields,
- )
-%>
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/bill_batch.cgi b/httemplate/search/bill_batch.cgi
index b6676f2..b740bdc 100755
--- a/httemplate/search/bill_batch.cgi
+++ b/httemplate/search/bill_batch.cgi
@@ -26,7 +26,7 @@ function start() {
% -expires => '-1d',
% );
% $r->headers_out->add( 'Set-Cookie' => $cookie->as_string );
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Invoice Batches',
'name_singular' => 'batch',
'query' => { 'table' => 'bill_batch',
@@ -67,9 +67,7 @@ function start() {
'agent_pos' => 1,
'html_foot' => include('.foot'),
- )
-
-%>
+&>
%}
<%def .foot>
<SCRIPT type="text/javascript">
diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index 5e917db..531688a 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'name' => 'call detail records',
'query' => $query,
@@ -28,8 +28,8 @@
'';
}
},
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi
index 90c8913..e001d56 100644
--- a/httemplate/search/cust_bill_event.cgi
+++ b/httemplate/search/cust_bill_event.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'html_init' => $html_init,
'menubar' => $menubar,
@@ -60,8 +60,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/cust_bill_pay.html b/httemplate/search/cust_bill_pay.html
index 79de749..8b5758b 100644
--- a/httemplate/search/cust_bill_pay.html
+++ b/httemplate/search/cust_bill_pay.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'name' => 'net payments',
'query' => $sql_query,
@@ -71,8 +71,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_bill_pkg_discount.html b/httemplate/search/cust_bill_pkg_discount.html
index bb8038a..5fd7aa9 100644
--- a/httemplate/search/cust_bill_pkg_discount.html
+++ b/httemplate/search/cust_bill_pkg_discount.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Discounts',
'name' => 'discounts',
'query' => $query,
@@ -68,8 +68,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
#a little false laziness below w/cust_bill_pkg.cgi
diff --git a/httemplate/search/cust_credit_bill.html b/httemplate/search/cust_credit_bill.html
index 9fd6a98..be43e92 100644
--- a/httemplate/search/cust_credit_bill.html
+++ b/httemplate/search/cust_credit_bill.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'name' => 'net credits',
'query' => $sql_query,
@@ -64,8 +64,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html
index 8b21f37..4640950 100644
--- a/httemplate/search/cust_credit_bill_pkg.html
+++ b/httemplate/search/cust_credit_bill_pkg.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Credit application detail', #to line item
'name_singular' => 'credit application',
'query' => $query,
@@ -96,8 +96,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
#LOTS of false laziness below w/cust_bill_pkg.cgi
diff --git a/httemplate/search/cust_credit_refund.html b/httemplate/search/cust_credit_refund.html
index 75138e9..f47dc6d 100644
--- a/httemplate/search/cust_credit_refund.html
+++ b/httemplate/search/cust_credit_refund.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'name' => 'net refunds',
'query' => $sql_query,
@@ -57,8 +57,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html
index 503f252..d47ce52 100644
--- a/httemplate/search/cust_event.html
+++ b/httemplate/search/cust_event.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'html_init' => $html_init,
'menubar' => $menubar,
@@ -62,8 +62,7 @@
#'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+&>
<%once>
my $status_sub = sub {
diff --git a/httemplate/search/cust_main-zip.html b/httemplate/search/cust_main-zip.html
index c317dc3..be8c5a6 100644
--- a/httemplate/search/cust_main-zip.html
+++ b/httemplate/search/cust_main-zip.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Zip code Search Results',
'name' => 'zip codes',
'query' => $sql_query,
@@ -6,8 +6,8 @@
'header' => [ 'Zip code', 'Customers', ],
#'fields' => [ 'zip', 'num_cust', ],
#'links' => [ '', sub { 'somewhere'; } ],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index 4d31a75..b5e582f 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => 'Batch payment details',
'name' => 'batch details',
'query' => $sql_query,
@@ -41,8 +41,7 @@
'link_onclicks' => [ ('') x 8,
$sub_receipt
],
- )
-%>
+&>
<%init>
my $conf = new FS::Conf;
diff --git a/httemplate/search/cust_pkg_discount.html b/httemplate/search/cust_pkg_discount.html
index d70c311..e6ba840 100644
--- a/httemplate/search/cust_pkg_discount.html
+++ b/httemplate/search/cust_pkg_discount.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Package discounts',
'name' => 'discounts',
'query' => $query,
@@ -50,8 +50,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_pkg_svc.html b/httemplate/search/cust_pkg_svc.html
index 9c5b32f..cdc7035 100644
--- a/httemplate/search/cust_pkg_svc.html
+++ b/httemplate/search/cust_pkg_svc.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $part_svc->svc.' services in package #'.$pkgnum,
'name' => 'services',
'html_form' => $html_form,
@@ -30,8 +30,8 @@
('')x4,
],
'html_foot' => sub { $areboxes ? $html_foot : '' }
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_tax_adjustment.html b/httemplate/search/cust_tax_adjustment.html
index 9254765..6125a1c 100644
--- a/httemplate/search/cust_tax_adjustment.html
+++ b/httemplate/search/cust_tax_adjustment.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'name_singular' => 'tax adjustment',
'query' => $query,
@@ -12,9 +12,8 @@
},
],
'links' => [ '', '', '', $ilink ],
- )
-%>
-
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/cust_tax_exempt.cgi b/httemplate/search/cust_tax_exempt.cgi
index 3704b20..1f26cfb 100644
--- a/httemplate/search/cust_tax_exempt.cgi
+++ b/httemplate/search/cust_tax_exempt.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Legacy tax exemptions',
'name' => 'legacy tax exemptions',
'query' => $query,
@@ -46,8 +46,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
my $join_cust = "
diff --git a/httemplate/search/cust_tax_exempt_pkg.cgi b/httemplate/search/cust_tax_exempt_pkg.cgi
index 3a5155a..7f0563c 100644
--- a/httemplate/search/cust_tax_exempt_pkg.cgi
+++ b/httemplate/search/cust_tax_exempt_pkg.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Tax exemptions',
'name' => 'tax exemptions',
'query' => $query,
@@ -77,8 +77,7 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+&>
<%once>
my $join_cust = "
diff --git a/httemplate/search/inventory_item.html b/httemplate/search/inventory_item.html
index 086c8e9..7f30a0d 100644
--- a/httemplate/search/inventory_item.html
+++ b/httemplate/search/inventory_item.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'menubar' => [ 'View inventory classes' =>
@@ -87,8 +87,8 @@
<INPUT TYPE="hidden" NAME="classnum" VALUE="$classnum">
<INPUT TYPE="hidden" NAME="avail" VALUE="! .$cgi->param('avail') . '">', #'
'html_foot' => $sub_foot,
- )
-%>
+
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/search/mailinglistmember.html b/httemplate/search/mailinglistmember.html
index ee395f4..a678d45 100644
--- a/httemplate/search/mailinglistmember.html
+++ b/httemplate/search/mailinglistmember.html
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => $title,
'name_singular' => 'member',
'query' => $query,
@@ -6,8 +6,7 @@
'header' => [ 'Email address' ],
'fields' => [ $email_sub, ], #just this one for now
'html_init' => $html_init,
- )
-%>
+&>
<%init>
#XXX ACL:
diff --git a/httemplate/search/part_pkg.html b/httemplate/search/part_pkg.html
index 57da9d4..2178346 100644
--- a/httemplate/search/part_pkg.html
+++ b/httemplate/search/part_pkg.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => $title,
'name_singular' => $name,
'header' => \@header,
@@ -14,8 +14,8 @@
'links' => \@links,
'align' => $align,
'sort_fields' => [],
- )
-%>
+
+&>
<%init>
#this is about reports about packages definitions (starting w/commission ones)
diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index b2a15ef..110d9c8 100755
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Payment Batches',
'name_singular' => 'batch',
'query' => { 'table' => 'pay_batch',
@@ -84,9 +84,8 @@
sub { shift->status eq 'I' ? "b" : '' },
],
'html_init' => $html_init,
- )
-
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/phone_avail.html b/httemplate/search/phone_avail.html
index 1335379..ce7d1bd 100644
--- a/httemplate/search/phone_avail.html
+++ b/httemplate/search/phone_avail.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Phone Number (DID) Search Results',
'name_singular' => 'phone number',
'query' => {
@@ -81,8 +81,8 @@
FS::UI::Web::cust_styles(),
'',
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/phone_inventory_provisioned.html b/httemplate/search/phone_inventory_provisioned.html
index 03d2154..b3efdbd 100644
--- a/httemplate/search/phone_inventory_provisioned.html
+++ b/httemplate/search/phone_inventory_provisioned.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'LATA Search Results',
'name_singular' => 'LATA',
'query' => {
@@ -72,8 +72,8 @@
'',
'',
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/prepay_credit.html b/httemplate/search/prepay_credit.html
index 3640351..7566e65 100644
--- a/httemplate/search/prepay_credit.html
+++ b/httemplate/search/prepay_credit.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Unused Prepaid Cards'.
($agent ? ' for '. $agent->agent : ''),
'menubar' => [
@@ -47,8 +47,8 @@
$agent ? [ "${p}edit/agent.cgi?", 'agentnum' ] : '';
},
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/prospect_main.html b/httemplate/search/prospect_main.html
index 328d120..ab37b90 100644
--- a/httemplate/search/prospect_main.html
+++ b/httemplate/search/prospect_main.html
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => 'Prospect Search Results',
'name_singular' => 'prospect',
'query' => $query,
@@ -23,8 +23,7 @@
'', #link to contact edit???
],
'agent_virt' => 1,
- )
-%>
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/qual.cgi b/httemplate/search/qual.cgi
index 7133ef0..7b718e4 100755
--- a/httemplate/search/qual.cgi
+++ b/httemplate/search/qual.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Qualifications',
'name_singular' => 'qualification',
'query' => { 'table' => 'qual',
@@ -51,8 +51,8 @@
'',
'',
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/queue.html b/httemplate/search/queue.html
index 1c12470..141c535 100644
--- a/httemplate/search/queue.html
+++ b/httemplate/search/queue.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Job Queue',
'name' => 'jobs',
'html_form' => qq!<FORM NAME="jobForm" ACTION="$p/misc/queue.cgi" METHOD="POST">!,
@@ -120,9 +120,8 @@
'';
}
},
- )
-
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/reg_code.html b/httemplate/search/reg_code.html
index f7d6d20..42211e5 100644
--- a/httemplate/search/reg_code.html
+++ b/httemplate/search/reg_code.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Unused Registration Codes for '.
$agent->agent,
'name' => 'registration codes',
@@ -23,8 +23,8 @@
#$plink,
'',
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/rt_ticket.html b/httemplate/search/rt_ticket.html
index 1ed5a38..8603ef2 100644
--- a/httemplate/search/rt_ticket.html
+++ b/httemplate/search/rt_ticket.html
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => 'Time worked summary',
'name_singular' => 'ticket',
'query' => $query,
@@ -31,8 +31,7 @@
'',
'',
],
- )
-%>
+&>
<%once>
my $format_seconds_sub = sub {
diff --git a/httemplate/search/rt_transaction.html b/httemplate/search/rt_transaction.html
index 1ae607b..eb250fb 100644
--- a/httemplate/search/rt_transaction.html
+++ b/httemplate/search/rt_transaction.html
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => 'Time worked',
'name_singular' => 'transaction',
'query' => $query,
@@ -29,8 +29,7 @@
'',
'',
],
- )
-%>
+&>
<%once>
my $format_seconds_sub = sub {
diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
index bf54469..71aa006 100644
--- a/httemplate/search/sql.html
+++ b/httemplate/search/sql.html
@@ -1,9 +1,9 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Query Results',
'name' => 'rows',
'query' => "SELECT $sql",
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi
index ee62e90..e56ec39 100755
--- a/httemplate/search/svc_broadband.cgi
+++ b/httemplate/search/svc_broadband.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Broadband Search Results',
'name' => 'broadband services',
'html_init' => $html_init,
@@ -49,8 +49,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied" unless
diff --git a/httemplate/search/svc_dish.cgi b/httemplate/search/svc_dish.cgi
index 94da035..069e781 100755
--- a/httemplate/search/svc_dish.cgi
+++ b/httemplate/search/svc_dish.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Dish Network Search Results',
'name' => 'services',
'query' => $sql_query,
@@ -34,8 +34,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 9827b8d..daf3574 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => "Domain Search Results",
'name' => 'domains',
'query' => $sql_query,
@@ -34,8 +34,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_external.cgi b/httemplate/search/svc_external.cgi
index cb51d44..a99900a 100755
--- a/httemplate/search/svc_external.cgi
+++ b/httemplate/search/svc_external.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'External service search results',
'name' => 'external services',
'query' => $sql_query,
@@ -40,9 +40,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
-
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index f17f131..d83aed8 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => "Mail forward Search Results",
'name' => 'mail forwards',
'query' => $sql_query,
@@ -39,8 +39,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_hardware.cgi b/httemplate/search/svc_hardware.cgi
index ec09be8..07c7712 100644
--- a/httemplate/search/svc_hardware.cgi
+++ b/httemplate/search/svc_hardware.cgi
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
'title' => 'Hardware service search results',
'name' => 'installations',
'query' => $sql_query,
@@ -34,8 +34,7 @@
FS::UI::Web::cust_colors() ],
'style' => [ $svc_cancel_style, ('') x 7,
FS::UI::Web::cust_styles() ],
- )
-%>
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_phone.cgi b/httemplate/search/svc_phone.cgi
index 65aa1ae..cc4aa60 100644
--- a/httemplate/search/svc_phone.cgi
+++ b/httemplate/search/svc_phone.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => "Phone number search results",
'name' => 'phone numbers',
'query' => $sql_query,
@@ -46,8 +46,8 @@
( map '', @header ),
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index adc31c8..e19ebdb 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Virtual Host Search Results',
'name' => 'virtual hosts',
'query' => $sql_query,
@@ -45,8 +45,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index bbfd033..fa4b895 100644
--- a/httemplate/search/timeworked.html
+++ b/httemplate/search/timeworked.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Time Worked',
'name' => 'time',
'html_form' => qq!<FORM NAME="timeForm" ACTION="${p}misc/timeworked.html" METHOD="POST">!,
@@ -33,9 +33,8 @@
'',
],
'html_foot' => $html_foot,
- )
-
-%>
+
+&>
<%init>
die "access denied"
diff --git a/httemplate/search/unprovisioned_services.html b/httemplate/search/unprovisioned_services.html
index f85e4fb..1bca432 100644
--- a/httemplate/search/unprovisioned_services.html
+++ b/httemplate/search/unprovisioned_services.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Unprovisioned Service Search Results',
'name' => 'packages with unprovisioned services',
'query' => {
@@ -54,8 +54,8 @@
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+
+&>
<%init>
die "access denied"
-----------------------------------------------------------------------
Summary of changes:
httemplate/browse/elements/browse.html | 5 ++---
httemplate/search/477partIA_detail.html | 6 +++---
httemplate/search/477partIA_summary.html | 6 +++---
httemplate/search/477partIIA.html | 6 +++---
httemplate/search/477partV.html | 6 +++---
httemplate/search/477partVI_census.html | 6 +++---
httemplate/search/agent_inventory.html | 5 ++---
httemplate/search/bill_batch.cgi | 6 ++----
httemplate/search/cdr.html | 6 +++---
httemplate/search/cust_bill_event.cgi | 6 +++---
httemplate/search/cust_bill_pay.html | 6 +++---
httemplate/search/cust_bill_pkg_discount.html | 6 +++---
httemplate/search/cust_credit_bill.html | 6 +++---
httemplate/search/cust_credit_bill_pkg.html | 6 +++---
httemplate/search/cust_credit_refund.html | 6 +++---
httemplate/search/cust_event.html | 5 ++---
httemplate/search/cust_main-zip.html | 6 +++---
httemplate/search/cust_pay_batch.cgi | 5 ++---
httemplate/search/cust_pkg_discount.html | 6 +++---
httemplate/search/cust_pkg_svc.html | 6 +++---
httemplate/search/cust_tax_adjustment.html | 7 +++----
httemplate/search/cust_tax_exempt.cgi | 6 +++---
httemplate/search/cust_tax_exempt_pkg.cgi | 5 ++---
httemplate/search/inventory_item.html | 6 +++---
httemplate/search/mailinglistmember.html | 5 ++---
httemplate/search/part_pkg.html | 6 +++---
httemplate/search/pay_batch.cgi | 7 +++----
httemplate/search/phone_avail.html | 6 +++---
httemplate/search/phone_inventory_provisioned.html | 6 +++---
httemplate/search/prepay_credit.html | 6 +++---
httemplate/search/prospect_main.html | 5 ++---
httemplate/search/qual.cgi | 6 +++---
httemplate/search/queue.html | 7 +++----
httemplate/search/reg_code.html | 6 +++---
httemplate/search/rt_ticket.html | 5 ++---
httemplate/search/rt_transaction.html | 5 ++---
httemplate/search/sql.html | 6 +++---
httemplate/search/svc_broadband.cgi | 6 +++---
httemplate/search/svc_dish.cgi | 6 +++---
httemplate/search/svc_domain.cgi | 6 +++---
httemplate/search/svc_external.cgi | 7 +++----
httemplate/search/svc_forward.cgi | 6 +++---
httemplate/search/svc_hardware.cgi | 5 ++---
httemplate/search/svc_phone.cgi | 6 +++---
httemplate/search/svc_www.cgi | 6 +++---
httemplate/search/timeworked.html | 7 +++----
httemplate/search/unprovisioned_services.html | 6 +++---
47 files changed, 130 insertions(+), 147 deletions(-)
More information about the freeside-commits
mailing list