Bug 17600: Standardize our EXPORT_OK

[srvgit] / catalogue / imageviewer.pl

diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index 7f4b710..e9c43a3 100755 (executable)
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -20,28 +20,27 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
-use C4::Images;
-use C4::Search;
+use C4::Auth qw( get_template_and_user );
+use C4::Items qw( GetItemsInfo );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Search qw( enabled_staff_search_views );
 
 use Koha::Biblios;
+use Koha::Items;
 use Koha::Patrons;
 
-my $query = new CGI;
+my $query = CGI->new;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "catalogue/imageviewer.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
 
-my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $itemnumber  = $query->param('itemnumber');
+my $biblionumber = $query->param('biblionumber') || $query->param('bib') || Koha::Items->find($itemnumber)->biblionumber;
 my $imagenumber = $query->param('imagenumber');
 my $biblio = Koha::Biblios->find( $biblionumber );
 my $itemcount = $biblio ? $biblio->items->count : 0;
@@ -66,16 +65,29 @@ if( $query->cookie("searchToOrder") ){
 }
 
 if ( C4::Context->preference("LocalCoverImages") ) {
-    my @images = ListImagesForBiblio($biblionumber);
-    $template->{VARS}->{'LocalCoverImages'} = 1;
-    $template->{VARS}->{'images'}           = \@images;
-    $template->{VARS}->{'imagenumber'}      = $imagenumber || $images[0] || '';
+    my $images;
+    if ( $itemnumber ) {
+        my $item = Koha::Items->find($itemnumber);
+        $images = $item->cover_images->as_list;
+    } else {
+        $images = $biblio->cover_images->as_list;
+    }
+
+    $template->param(
+        LocalCoverImages => 1,
+        images           => $images,
+        imagenumber      => ( $imagenumber || ( @$images ? $images->[0]->imagenumber : undef ) ),
+    );
 }
 $template->{VARS}->{'count'}        = $itemcount;
-$template->{VARS}->{'biblionumber'} = $biblionumber;
 $template->param(C4::Search::enabled_staff_search_views);
 $template->{VARS}->{'biblio'} = $biblio;
 
+$template->param(
+    biblionumber => $biblionumber,
+    itemnumber => $itemnumber,
+);
+
 my $hold_count = $biblio ? $biblio->holds->count : 0;
 $template->param( holdcount => $hold_count );