Bug 14607: Baker & Taylor cover images should be accessible by UPC as well as ISBN

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

diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index 24ac312..3302571 100755 (executable)
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -5,30 +5,30 @@
 #
 # 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 CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Koha;
 use C4::Output;
 use C4::Circulation;
 use C4::Review;
 use C4::Biblio;
-use C4::Dates qw/format_date/;
+use C4::Dates;
 use C4::Members qw/GetMemberDetails/;
 use POSIX qw(ceil strftime);
 
@@ -42,9 +42,9 @@ my $page = $query->param('page') || 1;
 $offset = ($page-1)*$results_per_page if $page>1;
 
 if ($format eq "rss") {
-    $template_name = "opac-showreviews-rss.tmpl";
+    $template_name = "opac-showreviews-rss.tt";
 } else {
-    $template_name = "opac-showreviews.tmpl",
+    $template_name = "opac-showreviews.tt",
 }
 
 my ( $template, $borrowernumber, $cookie ) = &get_template_and_user(
@@ -78,7 +78,7 @@ if ( C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowRe
 
 my $reviews = getallreviews(1,$offset,$results_per_page);
 my $marcflavour      = C4::Context->preference("marcflavour");
-my $hits = numberofreviews();
+my $hits = numberofreviews(1);
 my $i = 0;
 my $latest_comment_date;
 for my $result (@$reviews){
@@ -101,8 +101,10 @@ for my $result (@$reviews){
        $result->{size} = $bib->{'size'};
        $result->{notes} = $bib->{'notes'};
        $result->{timestamp} = $bib->{'timestamp'};
+    $result->{borrtitle} = $borr->{'title'};
        $result->{firstname} = $borr->{'firstname'};
        $result->{surname} = $borr->{'surname'};
+    $result->{userid} = $borr->{'userid'};
         if ($libravatar_enabled and $borr->{'email'}) {
             $result->{avatarurl} = libravatar_url(email => $borr->{'email'}, size => 40, https => $ENV{HTTPS});
         }
@@ -115,9 +117,6 @@ for my $result (@$reviews){
         my $rsstimestamp = C4::Dates->new($result->{datereviewed},"iso");
         my $rsstimestamp_output = $rsstimestamp->output("rfc822");
         $result->{timestamp} = $rsstimestamp_output;
-        $result->{datereviewed} = format_date($result->{datereviewed});
-    } else {
-        $result->{datereviewed} = format_date($result->{datereviewed});
     }
 }
 ## Build the page numbers on the bottom of the page
@@ -147,7 +146,8 @@ for my $result (@$reviews){
                     # the page number for this page
                     my $this_page_number = $i;
                     # it should only be highlighted if it's the current page
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
+                    my $highlight;
+            $highlight = 1 if ($this_page_number == $current_page_number);
                     # put it in the array
                     push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight };
 
@@ -159,7 +159,8 @@ for my $result (@$reviews){
                 for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) {
                     my $this_offset = ((($i-9)*$results_per_page)-$results_per_page);
                     my $this_page_number = $i-9;
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
+                    my $highlight;
+            $highlight = 1 if ($this_page_number == $current_page_number);
                     if ($this_page_number <= $pages) {
                         push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight };
                     }