X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-imageviewer.pl;h=bacbf848a7c7072115ebd6f437306cf89aefe1fe;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=300e90f0e476d1aaeebe37e1389f3885b662d59a;hpb=ba6c8485ca7afdaaace20d021591ac532de55b3a;p=srvgit

diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl
index 300e90f0e4..bacbf848a7 100755
--- a/opac/opac-imageviewer.pl
+++ b/opac/opac-imageviewer.pl
@@ -4,49 +4,57 @@
 #
 # 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 C4::Auth;
-use C4::Biblio;
-use C4::Output;
-use C4::Images;
+use CGI qw ( -utf8 );
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 
-my $query = new CGI;
+use Koha::Biblios;
+use Koha::CoverImages;
+use Koha::Items;
+
+my $query = CGI->new;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-imageviewer.tmpl",
+        template_name   => "opac-imageviewer.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-        flagsrequired => { borrow => 1 },
     }
 );
 
 my $biblionumber = $query->param('biblionumber') || $query->param('bib');
 my $imagenumber = $query->param('imagenumber');
-my ( $count, $biblio ) = GetBiblio($biblionumber);
+unless ( $biblionumber ) {
+    # Retrieving the biblio from the imagenumber
+    my $image = Koha::CoverImages->find($imagenumber);
+    my $item  = Koha::Items->find($image->{itemnumber});
+    $biblionumber = $item->biblionumber;
+}
+my $biblio = Koha::Biblios->find( $biblionumber );
 
 if ( C4::Context->preference("OPACLocalCoverImages") ) {
-    my @images = ListImagesForBiblio($biblionumber);
-    $template->{VARS}->{'OPACLocalCoverImages'} = 1;
-    $template->{VARS}->{'images'}               = \@images;
-    $template->{VARS}->{'biblionumber'}         = $biblionumber;
-    $template->{VARS}->{'imagenumber'} = $imagenumber || $images[0] || '';
+    my $images = !$imagenumber ? Koha::Biblios->find($biblionumber)->cover_images->as_list : [];
+    $template->param(
+        OPACLocalCoverImages => 1,
+        images               => $images,
+        biblionumber         => $biblionumber,
+        imagenumber          => (@$images ? $images->[0]->imagenumber : $imagenumber),
+    );
 }
 
 $template->{VARS}->{'biblio'} = $biblio;