Bug 8753: [QA Follow-up] Primary key and collation

[srvgit] / opac / opac-review.pl

diff --git a/opac/opac-review.pl b/opac/opac-review.pl
index 33cfd43..0d5d924 100755 (executable)
--- a/opac/opac-review.pl
+++ b/opac/opac-review.pl
@@ -1,67 +1,82 @@
 #!/usr/bin/perl
-use strict;
-require Exporter;
-use CGI;
 
+# Copyright 2006 Katipo Communications
+#
+# 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 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.
+#
+# 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 qw ( -utf8 );
 use C4::Auth;
 use C4::Koha;
-use HTML::Template;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Circulation::Circ2;
+use C4::Output;
 use C4::Review;
+use C4::Biblio;
+use C4::Scrubber;
+use C4::Debug;
 
-my $query = new CGI;
+my $query        = new CGI;
 my $biblionumber = $query->param('biblionumber');
-my $type = $query->param('type');
-my $review = $query->param('review');
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "opac-review.tmpl",
-                            query => $query,
-                            type => "opac",
-                            authnotrequired => 0,
-                            flagsrequired => {borrow => 1},
-                            debug => 1,
-                            });
-
-# get borrower information ....
-# my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-# $template->param($borr);
+my $review       = $query->param('review');
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-review.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+    }
+);
 
-my $biblio=bibdata($biblionumber,'opac');
+# FIXME: need to allow user to delete their own comment(s)
 
-my $savedreview=getreview($biblionumber,$borrowernumber);
-if ($type eq 'save'){
-   savereview($biblionumber,$borrowernumber,$review);    
-}
-if ($type eq 'update'){
-    updatereview($biblionumber,$borrowernumber,$review);
+my $biblio = GetBiblioData($biblionumber);
+my $savedreview = getreview($biblionumber,$borrowernumber);
+my ($clean, @errors);
+if (defined $review) {
+       if ($review !~ /\S/) {
+               push @errors, {empty=>1};
+       } else {
+               $clean = C4::Scrubber->new('comment')->scrub($review);
+               if ($clean !~ /\S/) {
+                       push @errors, {scrubbed_all=>1};
+               } else {
+                       if ($clean ne $review) {
+                               push @errors, {scrubbed=>$clean};
+                       }
+                       my $js_ok_review = $clean;
+                       $js_ok_review =~ s/"/&quot;/g;  # probably redundant w/ TMPL ESCAPE=JS
+                       $template->param(clean_review=>$js_ok_review);
+                       if ($savedreview) {
+                       updatereview($biblionumber, $borrowernumber, $clean);
+                       } else {
+                       savereview($biblionumber, $borrowernumber, $clean);
+                       }
+                       unless (@errors){ $template->param(WINDOW_CLOSE=>1); }
+               }
+       }
 }
-if ($savedreview){
-       $type="update";
-    }
-else {
-    $type="save";
-}
-my $reviewdata=$savedreview->{'review'};
-$template->param('biblionumber' => $biblionumber,
+(@errors   ) and $template->param(   ERRORS=>\@errors);
+($cgi_debug) and $template->param(cgi_debug=>1       );
+$template->param(
+    'biblionumber'   => $biblionumber,
     'borrowernumber' => $borrowernumber,
-    'type'=>$type,
-    'review'=>$reviewdata,
-    'title'=>$biblio->{'title'});
-
-# get the record
-my $order=$query->param('order');
-my $order2=$order;
-if ($order2 eq ''){
-  $order2="date_due desc";
-}
-my $limit=$query->param('limit');
-if ($limit eq 'full'){
-  $limit=0;
-} else {
-  $limit=50;
-}
+    'review'         => $clean || $savedreview->{'review'},
+       'reviewid'       => $query->param('reviewid') || 0,
+    'title'          => $biblio->{'title'},
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;