Bug 10572: DBrev 3.13.00.037

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

diff --git a/opac/opac-image.pl b/opac/opac-image.pl
index 340a47c..e2dc556 100755 (executable)
--- a/opac/opac-image.pl
+++ b/opac/opac-image.pl
@@ -58,62 +58,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( $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