X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-showreviews.pl;h=151c101fe3c974b1586da5ea7b59e2647b9b9a7a;hb=08382876306cfda839637c5f72a107b304458a8e;hp=c254d2682d828a7eff206c45b6f31ce2f3e5242b;hpb=a8222aeeb1169d7b1939d1e64c319a16e3846e8c;p=koha.git

diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index c254d2682d..151c101fe3 100755
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -14,9 +14,9 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 use strict;
 use warnings;
@@ -28,7 +28,7 @@ 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);
 
@@ -65,9 +65,20 @@ if($format eq "rss"){
         );
 }
 
+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 = 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){
@@ -90,8 +101,14 @@ 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;
 	}
@@ -100,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
@@ -132,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 };
 
@@ -144,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 };
                     }