[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 88ee94c8cbe28332a40c3d2ca3f84f3e14867a5b

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  88ee94c8cbe28332a40c3d2ca3f84f3e14867a5b (commit)
      from  7049340c3a9d305969ca8f2561a53d884398d6ee (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 88ee94c8cbe28332a40c3d2ca3f84f3e14867a5b
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Nov 27 21:44:49 2012 -0800

    remove trailing junk from XLSX files, #20337

diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html
index 98b4778..b7073db 100644
--- a/httemplate/graph/elements/report.html
+++ b/httemplate/graph/elements/report.html
@@ -126,8 +126,8 @@ any delimiter and linked from the elements in @data.
 %   $workbook->close();# or die "Error creating .xls file: $!";
 %
 %   http_header('Content-Length' => length($output) );
-%   
-<% $output %>
+%   $m->print($output);
+%
 % } elsif ( $cgi->param('_type') eq 'png' ) {
 %   # delete any items that shouldn't be on the graph
 %   if ( my $no_graph = $opt{'no_graph'} ) {
diff --git a/httemplate/search/customer_accounting_summary.html b/httemplate/search/customer_accounting_summary.html
index 5ce2e3a..5575283 100644
--- a/httemplate/search/customer_accounting_summary.html
+++ b/httemplate/search/customer_accounting_summary.html
@@ -73,9 +73,11 @@
   $r++;
   } #$row
   $workbook->close;
+
+  http_header('Content-Length' => length($output));
+  $m->print($output);
 </%perl>
-<% $output %>
-% } else { 
+% } else {
 <& /elements/header.html, $title &>
 % my $myself = $cgi->self_url;
 <P ALIGN="right" CLASS="noprint">
diff --git a/httemplate/search/elements/search-xls.html b/httemplate/search/elements/search-xls.html
index 94d88b0..26a51c4 100644
--- a/httemplate/search/elements/search-xls.html
+++ b/httemplate/search/elements/search-xls.html
@@ -1,4 +1,3 @@
-<% $data %>
 <%init>
 
 my %args = @_;
@@ -148,5 +147,6 @@ if ( $opt{'footer'} ) {
 $workbook->close();# or die "Error creating .xls file: $!";
 
 http_header('Content-Length' => length($data) );
+$m->print($data);
 
 </%init>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index eca68a2..5a16a22 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -176,7 +176,9 @@ Example:
 %
 % } elsif ( $type =~ /\.xls$/ ) {
 %
-<% include('search-xls.html',  header=>$header, rows=>$rows, opt=>\%opt ) %>
+<& 'search-xls.html',  header=>$header, rows=>$rows, opt=>\%opt &>\
+% # prevent the caller from polluting our output stream
+% $m->abort;
 %
 % } elsif ( $type eq 'xml' ) {
 %
diff --git a/httemplate/search/report_tax-xls.cgi b/httemplate/search/report_tax-xls.cgi
index f19f85a..bb843a7 100755
--- a/httemplate/search/report_tax-xls.cgi
+++ b/httemplate/search/report_tax-xls.cgi
@@ -1,4 +1,3 @@
-<% $data %>
 <%init>
 my $htmldoc = include('report_tax.cgi');
 
@@ -155,4 +154,6 @@ for my $x (0..scalar(@widths)-1) {
 
 $workbook->close;
 
+http_header('Content-Length' => length($data));
+$m->print($data);
 </%init>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/graph/elements/report.html              |    4 ++--
 httemplate/search/customer_accounting_summary.html |    6 ++++--
 httemplate/search/elements/search-xls.html         |    2 +-
 httemplate/search/elements/search.html             |    4 +++-
 httemplate/search/report_tax-xls.cgi               |    3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)