Bug 17600: Standardize our EXPORT_OK

[srvgit] / opac / opac-downloadcart.pl

diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index ec5e2c8..ade1a53 100755 (executable)
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.pl
@@ -20,14 +20,13 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use Encode qw(encode);
+use Encode qw( encode );
 
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw( GetFrameworkCode GetISBDView GetMarcBiblio );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Record;
-use C4::Ris;
+use C4::Ris qw( marc2ris );
 use Koha::CsvProfiles;
 use Koha::RecordProcessor;
 
@@ -66,6 +65,12 @@ if ($bib_list && $format) {
     # CSV   
     if ($format =~ /^\d+$/) {
 
+        my $csv_profile = Koha::CsvProfiles->find($format);
+        if ( not $csv_profile or $csv_profile->staff_only ) {
+            print $query->redirect('/cgi-bin/koha/errors/404.pl');
+            exit;
+        }
+
         $output = marc2csv(\@bibs, $format);
 
         # Other formats
@@ -90,7 +95,9 @@ if ($bib_list && $format) {
             next unless $record;
 
             if ($format eq 'iso2709') {
-                $output .= $record->as_usmarc();
+                #NOTE: If we don't explicitly UTF-8 encode the output,
+                #the browser will guess the encoding, and it won't always choose UTF-8.
+                $output .= encode("UTF-8", $record->as_usmarc()) // q{};
             }
             elsif ($format eq 'ris') {
                 $output .= marc2ris($record);
@@ -122,7 +129,17 @@ if ($bib_list && $format) {
     print $output;
 
 } else { 
-    $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc', used_for => 'export_records' }) ]);
+    $template->param(
+        csv_profiles => [
+            Koha::CsvProfiles->search(
+                {
+                    type       => 'marc',
+                    used_for   => 'export_records',
+                    staff_only => 0
+                }
+            )
+        ]
+    );
     $template->param(bib_list => $bib_list); 
     output_html_with_http_headers $query, $cookie, $template->output;
 }