Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / opac / opac-retrieve-file.pl

diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl
index d5406e6..d19f9dd 100755 (executable)
--- a/opac/opac-retrieve-file.pl
+++ b/opac/opac-retrieve-file.pl
@@ -1,47 +1,53 @@
 #!/usr/bin/perl
 
-# Copyright 2011-2012 BibLibre
-#
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Copyright (C) 2011-2012 BibLibre
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
 use CGI;
+use Encode;
 
+use C4::Auth;
 use C4::Context;
-use C4::UploadedFiles;
-
-my $input = new CGI;
-
-my $id = $input->param('id');
-my $file = C4::UploadedFiles::GetUploadedFile($id);
-exit 1 if not $file;
-
-my $file_path = $file->{filepath};
-
-if( -f $file_path ) {
-    open my $fh, '<', $file_path or die "Can't open file: $!";
-    print $input->header(
-        -type => "application/octet-stream",
-        -attachment => $file->{filename}
-    );
-    while(<$fh>) {
+use C4::Output;
+use Koha::UploadedFiles;
+
+my $input = CGI::->new;
+my $hash = $input->param('id'); # historically called id (used in URLs?)
+
+my $rec = Koha::UploadedFiles->search({
+    hashvalue => $hash, public => 1,
+    # DO NOT REMOVE the public flag: this is an opac script !
+})->next;
+my $fh = $rec? $rec->file_handle: undef;
+
+if( !$rec || !$fh ) {
+    my ( $template, $user, $cookie ) = get_template_and_user({
+        query           => $input,
+        template_name   => 'opac-retrieve-file.tt',
+        type            => 'opac',
+        authnotrequired => 1,
+    });
+    $template->param( hash => $hash );
+    output_html_with_http_headers $input, $cookie, $template->output;
+} else {
+    print Encode::encode_utf8( $input->header( $rec->httpheaders ) );
+    while( <$fh> ) {
         print $_;
     }
-} else {
-    exit 1;
+    $fh->close;
 }
-
-exit 0;