X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-showreviews.pl;h=839a5368fe6e0acad926a60eec961d4ded06c87d;hb=ab9a082b5f418c17063def1b0fa678b59f247fe2;hp=f1e0b5320d4e6fa5f402fe1a8a9d0bf1206dbf35;hpb=9e3dbeaf39f9327428b07877db203cb0d6a57977;p=koha.git

diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index f1e0b5320d..839a5368fe 100755
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -5,32 +5,32 @@
 #
 # 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::Members qw/GetMemberDetails/;
-use POSIX qw(ceil strftime);
+use Koha::DateUtils;
+use Koha::Reviews;
+use POSIX qw(ceil floor strftime);
 
 my $template_name;
 my $query = new CGI;
@@ -38,13 +38,12 @@ my $format = $query->param("format") || '';
 my $count = C4::Context->preference('OPACnumSearchResults') || 20;
 my $results_per_page = $query->param('count') || $count;
 my $offset = $query->param('offset') || 0;
-my $page = $query->param('page') || 1;
-$offset = ($page-1)*$results_per_page if $page>1;
+my $page = floor( $offset / $results_per_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(
@@ -57,17 +56,35 @@ my ( $template, $borrowernumber, $cookie ) = &get_template_and_user(
 );
 
 if($format eq "rss"){
-    my $lastbuilddate = C4::Dates->new();
-    my $lastbuilddate_output = $lastbuilddate->output("rfc822");
+    my $lastbuilddate = dt_from_string;
+    my $lastbuilddate_output = $lastbuilddate->strftime("%a, %d %b %Y %H:%M:%S %z");
     $template->param(
         rss => 1,
         timestamp => $lastbuilddate_output
         );
 }
 
-my $reviews = getallreviews(1,$offset,$results_per_page);
+my $libravatar_enabled = 0;
+if ( C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) {
+    eval {
+        require Libravatar::URL;
+        Libravatar::URL->import();
+    };
+    if ( !$@ ) {
+        $libravatar_enabled = 1;
+    }
+}
+
+my $reviews = Koha::Reviews->search(
+    { approved => 1 },
+    {
+        rows => $results_per_page,
+        page => $page,
+        order_by => { -desc => 'datereviewed' },
+    }
+)->unblessed;
 my $marcflavour      = C4::Context->preference("marcflavour");
-my $hits = numberofreviews();
+my $hits = Koha::Reviews->search({ approved => 1 })->count;
 my $i = 0;
 my $latest_comment_date;
 for my $result (@$reviews){
@@ -90,19 +107,23 @@ 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});
+        }
+
     if ($result->{borrowernumber} eq $borrowernumber) {
 		$result->{your_comment} = 1;
 	}
 
     if($format eq "rss"){
-        my $rsstimestamp = C4::Dates->new($result->{datereviewed},"iso");
-        my $rsstimestamp_output = $rsstimestamp->output("rfc822");
+        my $rsstimestamp = eval { dt_from_string( $result->{datereviewed} ); };
+        $rsstimestamp = dt_from_string unless ( $rsstimestamp ); #default to today if something went wrong
+        my $rsstimestamp_output = $rsstimestamp->strftime("%a, %d %b %Y %H:%M:%S %z");
         $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
@@ -132,7 +153,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 };
 
@@ -144,7 +166,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 };
                     }
@@ -157,6 +180,7 @@ $template->param(next_page_offset => $next_page_offset) unless $pages eq $curren
 
 $template->param(
     reviews => $reviews,
+    results_per_page => $results_per_page,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;