From 7a0da5ac43efdef3428d9268c141a747b3d0c989 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 3 Jan 2011 15:40:01 +0100 Subject: [PATCH] =?utf8?q?CSV-Export=20f=C3=BCr=20ISO-=20und=20UTF-8,=20mi?= =?utf8?q?t=20und=20ohne=20FastCGI=20gefixt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix für Bug 1535. --- SL/Dispatcher.pm | 9 ++++++++- SL/ReportGenerator.pm | 29 +++++++++++++++++------------ admin.pl | 2 +- dispatcher.fpl | 2 +- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index e6aa54774..4a3f131d3 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -147,7 +147,8 @@ sub _run_controller { } sub handle_request { - my $self = shift; + my $self = shift; + $self->{request} = shift; $::lxdebug->enter_sub; $::lxdebug->begin_request; @@ -306,6 +307,12 @@ sub _route_controller_request { return ($controller, $action); } +sub get_standard_filehandles { + my $self = shift; + + return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR); +} + package main; use strict; diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index 2b37e78f5..f6095a8a0 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -686,17 +686,26 @@ sub _print_content { } } -sub unescape_string { - my ($self, $text, $do_iconv) = @_; +sub _handle_quoting_and_encoding { + my ($self, $text, $do_unquote) = @_; - $text = $main::locale->unquote_special_chars('HTML', $text); - $text = $::locale->{iconv}->convert($text) if $do_iconv; + $text = $main::locale->unquote_special_chars('HTML', $text) if $do_unquote; + $text = Encode::encode('UTF-8', $text) if $::locale->is_utf8; return $text; } sub generate_csv_content { - my $self = shift; + my $self = shift; + my $stdout = ($::dispatcher->get_standard_filehandles)[1]; + + # Text::CSV_XS seems to downgrade to bytes already (see + # SL/FCGIFixes.pm). Therefore don't let FCGI do that again. + $::locale->with_raw_io($stdout, sub { $self->_generate_csv_content($stdout) }); +} + +sub _generate_csv_content { + my ($self, $stdout) = @_; my %valid_sep_chars = (';' => ';', ',' => ',', ':' => ':', 'TAB' => "\t"); my %valid_escape_chars = ('"' => 1, "'" => 1); @@ -718,13 +727,9 @@ sub generate_csv_content { my @visible_columns = $self->get_visible_columns('CSV'); - my $stdout; - open $stdout, '>-'; - binmode $stdout, ':encoding(utf8)' if $::locale->is_utf8; - if ($opts->{headers}) { if (!$self->{custom_headers}) { - $csv->print($stdout, [ map { $self->unescape_string($self->{columns}->{$_}->{text}, 1) } @visible_columns ]); + $csv->print($stdout, [ map { $self->_handle_quoting_and_encoding($self->{columns}->{$_}->{text}, 1) } @visible_columns ]); } else { foreach my $row (@{ $self->{custom_headers} }) { @@ -732,7 +737,7 @@ sub generate_csv_content { foreach my $col (@{ $row }) { my $num_output = ($col->{colspan} && ($col->{colspan} > 1)) ? $col->{colspan} : 1; - push @{ $fields }, ($self->unescape_string($col->{text})) x $num_output; + push @{ $fields }, ($self->_handle_quoting_and_encoding($col->{text}, 1)) x $num_output; } $csv->print($stdout, $fields); @@ -754,7 +759,7 @@ sub generate_csv_content { my $num_output = ($row->{$col}{colspan} && ($row->{$col}->{colspan} > 1)) ? $row->{$col}->{colspan} : 1; $skip_next = $num_output - 1; - push @data, join($eol, map { s/\r?\n/$eol/g; $_ } @{ $row->{$col}->{data} }); + push @data, join($eol, map { s/\r?\n/$eol/g; $self->_handle_quoting_and_encoding($_, 0) } @{ $row->{$col}->{data} }); push @data, ('') x $skip_next if ($skip_next); } diff --git a/admin.pl b/admin.pl index 60c4ff206..433ffe9d3 100755 --- a/admin.pl +++ b/admin.pl @@ -4,7 +4,7 @@ use strict; use SL::Dispatcher; -my $dispatcher = SL::Dispatcher->new('CGI'); +our $dispatcher = SL::Dispatcher->new('CGI'); $dispatcher->pre_startup; $dispatcher->handle_request; diff --git a/dispatcher.fpl b/dispatcher.fpl index e5c8ca9dd..ba5f288d1 100755 --- a/dispatcher.fpl +++ b/dispatcher.fpl @@ -8,7 +8,7 @@ use SL::FCGIFixes; SL::FCGIFixes::apply_fixes(); -my $dispatcher = SL::Dispatcher->new('FastCGI'); +our $dispatcher = SL::Dispatcher->new('FastCGI'); $dispatcher->pre_startup; my $request = FCGI::Request(); -- 2.20.1