From eb4bace4170b79c7308468a1ebe4d61cef3221a7 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 28 Feb 2017 10:02:39 +0100 Subject: [PATCH] =?utf8?q?Dateimanagement:=20DownloadZip:=20etwas=20aufger?= =?utf8?q?=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/DownloadZip.pm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/SL/Controller/DownloadZip.pm b/SL/Controller/DownloadZip.pm index 92a03fcf7..33514c4a7 100644 --- a/SL/Controller/DownloadZip.pm +++ b/SL/Controller/DownloadZip.pm @@ -53,19 +53,10 @@ sub action_download_orderitems_files { my @files = SL::File->get_all(object_id => $item->parts_id, object_type => $element_type, ); - my @wanted_files; - ## also for filtering if needed: - # if ( $doctype ) { - # @wanted_files = grep { $_->{file_name} =~ /$doctype/ } @files; - # } else { - @wanted_files = @files; - # } - if ( scalar (@wanted_files) > 0 ) { - $zip->addDirectory($item->part->partnumber); - $zip->addFile($_->get_file, - Encode::encode($name_encoding,$item->part->partnumber.'/'.$_->db_file->file_name) - ) for @wanted_files; - } + next unless @files; + + $zip->addDirectory($item->part->partnumber); + $zip->addFile($_->get_file, Encode::encode($name_encoding, $item->part->partnumber . '/' . $_->db_file->file_name)) for @files; } } unless ( $zip->writeToFileNamed($sfile->file_name) == Archive::Zip::AZ_OK ) { -- 2.39.5