X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-ratings-ajax.pl;h=8620368b53368e4942d7482488e7b4589ef7bdc9;hb=677fd902f377ef81b6623545f0e67bb10af64e93;hp=88f2634d5a3c223ca02c68a327e65e1266aebf0c;hpb=1ee7f449be2ba45c2458d2ac571172ecf58752b2;p=koha.git

diff --git a/opac/opac-ratings-ajax.pl b/opac/opac-ratings-ajax.pl
index 88f2634d5a..8620368b53 100755
--- a/opac/opac-ratings-ajax.pl
+++ b/opac/opac-ratings-ajax.pl
@@ -4,18 +4,18 @@
 #
 # 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>.
 
 =head1 DESCRIPTION
 
@@ -23,17 +23,18 @@ A script that takes an ajax json query, and then inserts or modifies a star-rati
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use CGI::Cookie;  # need to check cookies before having CGI parse the POST request
 
 use C4::Auth qw(:DEFAULT check_cookie_auth);
 use C4::Context;
 use C4::Debug;
-use C4::Output 3.02 qw(:html :ajax pagination_bar);
-use C4::Ratings;
+use C4::Output qw(:html :ajax pagination_bar);
+
+use Koha::Ratings;
+
 use JSON;
 
 my $is_ajax = is_ajax();
@@ -67,29 +68,31 @@ else {
 }
 
 my $rating;
+$rating_value //= '';
 
-undef $rating_value if $rating_value eq '';
-
-if ( !$rating_value ) {
-#### delete
-    $rating = DelRating( $biblionumber, $loggedinuser );
+if ( $rating_value eq '' ) {
+    my $rating = Koha::Ratings->find( { biblionumber => $biblionumber, borrowernumber => $loggedinuser } );
+    $rating->delete if $rating;
 }
 
 elsif ( $rating_value and !$rating_old_value ) {
-#### insert
-    $rating = AddRating( $biblionumber, $loggedinuser, $rating_value );
+    Koha::Rating->new( { biblionumber => $biblionumber, borrowernumber => $loggedinuser, rating_value => $rating_value, })->store;
 }
 
 elsif ( $rating_value ne $rating_old_value ) {
-#### mod
-    $rating = ModRating( $biblionumber, $loggedinuser, $rating_value );
+    my $rating = Koha::Ratings->find( { biblionumber => $biblionumber, borrowernumber => $loggedinuser });
+    $rating->rating_value($rating_value)->store if $rating
 }
 
+my $ratings = Koha::Ratings->search({ biblionumber => $biblionumber });
+my $my_rating = $ratings->search({ borrowernumber => $loggedinuser })->next;
+my $avg = $ratings->get_avg_rating;
+
 my %js_reply = (
-    rating_total   => $rating->{'rating_total'},
-    rating_avg     => $rating->{'rating_avg'},
-    rating_avg_int => $rating->{'rating_avg_int'},
-    rating_value   => $rating->{'rating_value'},
+    rating_total   => $ratings->count,
+    rating_avg     => $avg,
+    rating_avg_int => sprintf("%.0f", $avg),
+    rating_value   => $my_rating ? $my_rating->rating_value : undef,
     auth_status    => $auth_status,
 
 );
@@ -106,7 +109,7 @@ exit;
 # a ratings specific ajax return sub, returns CGI object, and an 'auth_success' value
 sub ajax_auth_cgi {
     my $needed_flags = shift;
-    my %cookies      = fetch CGI::Cookie;
+    my %cookies      = CGI::Cookie->fetch;
     my $input        = CGI->new;
     my $sessid = $cookies{'CGISESSID'}->value || $input->param('CGISESSID');
     my ( $auth_status, $auth_sessid ) =