Merge remote branch 'origin/new/bug6554_reverts'

[koha.git] / catalogue / imageviewer.pl

diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index caa793e..c96e5af 100755 (executable)
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -40,38 +40,45 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 my $biblionumber = $query->param('biblionumber') || $query->param('bib');
-my $imagenumber = $query ->param('imagenumber');
-my ($count, $biblio) = GetBiblio($biblionumber);
+my $imagenumber = $query->param('imagenumber');
+my $biblio = GetBiblio($biblionumber);
 my $itemcount = GetItemsCount($biblionumber);
 
-my @items = GetItemsInfo( $biblionumber );
+my @items = GetItemsInfo($biblionumber);
 
 my $norequests = 1;
 foreach my $item (@items) {
+
     # can place holds defaults to yes
-    $norequests = 0 unless ( ( $item->{'notforloan_per_itemtype'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
+    $norequests = 0
+      unless ( ( $item->{'notforloan_per_itemtype'} > 0 )
+        || ( $item->{'itemnotforloan'} > 0 ) );
 }
 
-if($query->cookie("holdfor")){
-    my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
+if ( $query->cookie("holdfor") ) {
+    my $holdfor_patron =
+      GetMember( 'borrowernumber' => $query->cookie("holdfor") );
     $template->param(
-        holdfor => $query->cookie("holdfor"),
-        holdfor_surname => $holdfor_patron->{'surname'},
-        holdfor_firstname => $holdfor_patron->{'firstname'},
+        holdfor            => $query->cookie("holdfor"),
+        holdfor_surname    => $holdfor_patron->{'surname'},
+        holdfor_firstname  => $holdfor_patron->{'firstname'},
         holdfor_cardnumber => $holdfor_patron->{'cardnumber'},
     );
 }
 
-if (C4::Context->preference("LocalCoverImages")) {
+if ( C4::Context->preference("LocalCoverImages") ) {
     my @images = ListImagesForBiblio($biblionumber);
     $template->{VARS}->{'LocalCoverImages'} = 1;
-    $template->{VARS}->{'images'} = \@images;
-    $template->{VARS}->{'imagenumber'} = $imagenumber || $images[0] || '';
+    $template->{VARS}->{'images'}           = \@images;
+    $template->{VARS}->{'imagenumber'}      = $imagenumber || $images[0] || '';
 }
-    $template->{VARS}->{'count'} = $itemcount;
-    $template->{VARS}->{'biblionumber'} = $biblionumber;
-    $template->{VARS}->{'norequests'} = $norequests;
-    $template->param( C4::Search::enabled_staff_search_views );
-    $template->{VARS}->{'biblio'} = $biblio;
+$template->{VARS}->{'count'}        = $itemcount;
+$template->{VARS}->{'biblionumber'} = $biblionumber;
+$template->{VARS}->{'norequests'}   = $norequests;
+$template->param(C4::Search::enabled_staff_search_views);
+$template->{VARS}->{'biblio'} = $biblio;
+
+my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);
+$template->param( holdcount => $holdcount, holds => $holds );
 
 output_html_with_http_headers $query, $cookie, $template->output;