diff options
| author | Mark Wells <mark@freeside.biz> | 2012-07-13 15:33:43 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-07-13 15:33:43 -0700 |
| commit | 8ce2c1f11378b22966ec536f11898b4708a40237 (patch) | |
| tree | 6b3a23fa6c52dcd930fef9ff092f0af2de6eb137 /httemplate/search | |
| parent | 15db7ad6e6ea2e57784368eec80e4aae54358f77 (diff) | |
XLSX format for spreadsheet download, #17971
Diffstat (limited to 'httemplate/search')
| -rw-r--r-- | httemplate/search/elements/search-xls.html | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/httemplate/search/elements/search-xls.html b/httemplate/search/elements/search-xls.html index a3a8226c5..c862dfbbe 100644 --- a/httemplate/search/elements/search-xls.html +++ b/httemplate/search/elements/search-xls.html @@ -7,14 +7,17 @@ my $header = $args{'header'}; my $rows = $args{'rows'}; my %opt = %{ $args{'opt'} }; +my $format = $FS::CurrentUser::CurrentUser->spreadsheet_format; +my $filename = $opt{'name'} || PL($opt{'name_singular'}); +$filename .= $format->{extension}; + #http_header('Content-Type' => 'application/excel' ); #eww #http_header('Content-Type' => 'application/msexcel' ); #alas #http_header('Content-Type' => 'application/x-msexcel' ); #? #http://support.microsoft.com/kb/199841 -http_header('Content-Type' => 'application/vnd.ms-excel' ); -http_header('Content-Disposition' => - 'attachment;filename="'.($opt{'name'} || PL($opt{'name_singular'}) ).'.xls"'); +http_header('Content-Type' => $format->{mime_type} ); +http_header('Content-Disposition' => qq!attachment;filename="$filename"! ); #http://support.microsoft.com/kb/812935 #http://support.microsoft.com/kb/323308 @@ -22,8 +25,8 @@ $HTML::Mason::Commands::r->headers_out->{'Cache-control'} = 'max-age=0'; my $data = ''; my $XLS = new IO::Scalar \$data; -my $workbook = Spreadsheet::WriteExcel->new($XLS) - or die "Error opening .xls file: $!"; +my $workbook = $format->{class}->new($XLS) + or die "Error opening Excel file: $!"; my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31)); |