Bugfix #1624 - remove problem w/ EXPR in template, minor cleanup of module.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Review.pm b/C4/Review.pm
index 3d0da03..163efc6 100644 (file)
--- a/C4/Review.pm
+++ b/C4/Review.pm
@@ -99,10 +99,7 @@ sub numberofreviews {
       "SELECT count(*) FROM reviews WHERE biblionumber=? and approved=?";
     my $sth = $dbh->prepare($query);
     $sth->execute( $biblionumber, 1 );
-    my $count = $sth->fetchrow_hashref;
-
-    $sth->finish();
-    return ( $count->{'count(*)'} );
+       return $sth->fetchrow;
 }
 
 sub getreviews {
@@ -112,12 +109,7 @@ sub getreviews {
 "SELECT * FROM reviews WHERE biblionumber=? and approved=? order by datereviewed desc";
     my $sth = $dbh->prepare($query) || warn $dbh->err_str;
     $sth->execute( $biblionumber, $approved );
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref() ) {
-        push @results, $data;
-    }
-    $sth->finish();
-    return ( \@results );
+       return $sth->fetchall_arrayref({});
 }
 
 sub getallreviews {
@@ -127,12 +119,7 @@ sub getallreviews {
       "SELECT * FROM reviews WHERE approved=? order by datereviewed desc";
     my $sth = $dbh->prepare($query);
     $sth->execute($status);
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref() ) {
-        push @results, $data;
-    }
-    $sth->finish();
-    return ( \@results );
+       return $sth->fetchall_arrayref({});
 }
 
 =head2 approvereview

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index e1ea077..e76f905 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -334,41 +334,36 @@
 
 <!-- TMPL_IF NAME="reviewson" -->
 <div id="comments">
-               <div id="newcomment"></div>
-<!-- TMPL_IF NAME="reviews" -->
-        <!--TMPL_LOOP NAME="reviews"-->
-                       <!-- TMPL_IF NAME="loggedinusername" -->
-                       <!-- TMPL_IF EXPR="userid eq loggedinusername" -->
+       <div id="newcomment"></div>
+       <!-- TMPL_IF NAME="reviews" -->
+        <!-- TMPL_LOOP NAME="reviews" -->
+                       <!-- TMPL_IF NAME="your_comment" -->
                        <div class="commentline yours" id="c<!-- TMPL_VAR NAME="reviewid" -->">
                        <h5>
                                Your Comment
                        </h5>
-                       <small>
-                <!--TMPL_VAR NAME="datereviewed"-->
-            </small>
+                       <small><!-- TMPL_VAR NAME="datereviewed" --></small>
         <p>
-          <!--TMPL_VAR NAME="review"--> <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;reviewid=<!-- TMPL_VAR NAME="reviewid" -->');">Edit</a>
+          <!-- TMPL_VAR NAME="review" -->
+                 <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;reviewid=<!-- TMPL_VAR NAME="reviewid" -->');">Edit</a>
         </p></div>
                        <!-- TMPL_ELSE -->
                        <div class="commentline">
                        <h5>
                 Comment by
-                <!--TMPL_VAR NAME="title"-->
-                <!--TMPL_VAR NAME="firstname"-->
-                <!--TMPL_VAR NAME="surname"-->
+                <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_VAR NAME="firstname" -->
+                <!-- TMPL_VAR NAME="surname" -->
             </h5>
-                       <small>
-                <!--TMPL_VAR NAME="datereviewed"-->
-            </small>
+                       <small><!-- TMPL_VAR NAME="datereviewed" --></small>
         <p>
-          <!--TMPL_VAR NAME="review"-->
+          <!-- TMPL_VAR NAME="review" -->
         </p></div>
                        <!-- /TMPL_IF -->
-                       <!-- /TMPL_IF -->
-        <!--/TMPL_LOOP-->
+        <!-- /TMPL_LOOP -->
     <!-- TMPL_ELSE  -->
         <p>There are no comments for this item.</p>
-<!-- /TMPL_IF -->
+       <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="loggedinusername" -->
                <!-- TMPL_UNLESS NAME="loggedincommenter" -->
        <div id="addcomment"> <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->'); return false;">
@@ -378,7 +373,7 @@
     <!-- TMPL_ELSE -->
         <div id="addcomment"><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to post a comment.</div>
     <!-- /TMPL_IF -->
-       </div>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="OPACFRBRizeEditions" --><!-- TMPL_IF NAME="XISBNS" --><div id="editions">

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 91aa87d..792d204 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -181,15 +181,17 @@ $template->param(
 my $reviews = getreviews( $biblionumber, 1 );
 my $loggedincommenter;
 foreach ( @$reviews ) {
-    my $borrower_number_review = $_->{borrowernumber};
-    my $borrowerData           = GetMember($borrower_number_review,'borrowernumber');
+    my $borrowerData   = GetMember($_->{borrowernumber},'borrowernumber');
     # setting some borrower info into this hash
     $_->{title}     = $borrowerData->{'title'};
     $_->{surname}   = $borrowerData->{'surname'};
     $_->{firstname} = $borrowerData->{'firstname'};
-    $_->{userid} = $borrowerData->{'userid'};
+    $_->{userid}    = $borrowerData->{'userid'};
     $_->{datereviewed} = format_date($_->{datereviewed});
-    if($borrowerData->{'borrowernumber'} eq $borrowernumber){ $loggedincommenter = 1; }
+    if ($borrowerData->{'borrowernumber'} eq $borrowernumber) {
+               $_->{your_comment} = 1;
+               $loggedincommenter = 1;
+       }
 }
 
 
@@ -204,7 +206,7 @@ $template->param(
     subscriptions       => \@subs,
     subscriptionsnumber => $subscriptionsnumber,
     reviews             => $reviews,
-    loggedincommenter => $loggedincommenter
+    loggedincommenter   => $loggedincommenter
 );
 
 # XISBN Stuff