ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / opac / opac-image.pl

diff --git a/opac/opac-image.pl b/opac/opac-image.pl
index 340a47c..7a94e81 100755 (executable)
--- a/opac/opac-image.pl
+++ b/opac/opac-image.pl
@@ -7,26 +7,25 @@
 #
 # 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.
+# 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 strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Images;
 
@@ -58,62 +57,43 @@ imagenumber, a random image is selected.
 
 =cut
 
-error() unless C4::Context->preference("OPACLocalCoverImages");
-
-if ( defined $data->param('imagenumber') ) {
-    $imagenumber = $data->param('imagenumber');
-}
-elsif ( defined $data->param('biblionumber') ) {
-    my @imagenumbers = ListImagesForBiblio( $data->param('biblionumber') );
-    if (@imagenumbers) {
-        $imagenumber = $imagenumbers[0];
-    }
-    else {
-        warn "No images for this biblio" if $DEBUG;
-        error();
+my ( $image, $mimetype ) = C4::Images->NoImage;
+if ( C4::Context->preference("OPACLocalCoverImages") ) {
+    if ( defined $data->param('imagenumber') ) {
+        $imagenumber = $data->param('imagenumber');
     }
-}
-else {
-    $imagenumber = shift;
-}
-
-if ($imagenumber) {
-    warn "imagenumber passed in: $imagenumber" if $DEBUG;
-    my $imagedata = RetrieveImage($imagenumber);
-
-    error() unless $imagedata;
-
-    if ($imagedata) {
-        my $image;
-        if ( $data->param('thumbnail') ) {
-            $image = $imagedata->{'thumbnail'};
+    elsif ( defined $data->param('biblionumber') ) {
+        my @imagenumbers = ListImagesForBiblio( scalar $data->param('biblionumber') );
+        if (@imagenumbers) {
+            $imagenumber = $imagenumbers[0];
         }
         else {
-            $image = $imagedata->{'imagefile'};
+            warn "No images for this biblio" if $DEBUG;
         }
-        print $data->header(
-            -type            => $imagedata->{'mimetype'},
-            -'Cache-Control' => 'no-store',
-            -expires         => 'now',
-            -Content_Length  => length($image)
-        ), $image;
-        exit;
     }
     else {
-        warn "No image exists for $imagenumber" if $DEBUG;
-        error();
+        $imagenumber = shift;
     }
-}
-else {
-    error();
-}
 
-error();
-
-sub error {
-    print $data->header( -status => '404', -expires => 'now' );
-    exit;
+    if ($imagenumber) {
+        warn "imagenumber passed in: $imagenumber" if $DEBUG;
+        my $imagedata = RetrieveImage($imagenumber);
+        if ($imagedata) {
+            if ( $data->param('thumbnail') ) {
+                $image = $imagedata->{'thumbnail'};
+            }
+            else {
+                $image = $imagedata->{'imagefile'};
+            }
+            $mimetype = $imagedata->{'mimetype'};
+        }
+    }
 }
+print $data->header(
+    -type            => $mimetype,
+    -expires         => '+30m',
+    -Content_Length  => length($image)
+), $image;
 
 =head1 AUTHOR