[followup](bug #4062) marc21 item support

[koha.git] / opac / opac-review.pl

diff --git a/opac/opac-review.pl b/opac/opac-review.pl
index 3e68649..57a460f 100755 (executable)
--- a/opac/opac-review.pl
+++ b/opac/opac-review.pl
@@ -18,20 +18,19 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Koha;
 use C4::Output;
-use C4::Circulation;
 use C4::Review;
 use C4::Biblio;
+use C4::Scrubber;
+use C4::Debug;
 
 my $query        = new CGI;
 my $biblionumber = $query->param('biblionumber');
-my $type         = $query->param('type');
 my $review       = $query->param('review');
-my $reviewid       = $query->param('reviewid');
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "opac-review.tmpl",
@@ -41,44 +40,43 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $biblio = GetBiblioData( $biblionumber);
+# FIXME: need to allow user to delete their own comment(s)
 
-my $savedreview = getreview( $biblionumber, $borrowernumber );
-if ( $type eq 'save' ) {
-    savereview( $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/"/"/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 ( $type eq 'update' ) {
-    updatereview( $biblionumber, $borrowernumber, $review );
-}
-if ($savedreview) {
-    $type = "update";
-}
-else {
-    $type = "save";
-}
-my $reviewdata = $savedreview->{'review'};
+(@errors   ) and $template->param(   ERRORS=>\@errors);
+($cgi_debug) and $template->param(cgi_debug=>1       );
 $template->param(
     'biblionumber'   => $biblionumber,
     'borrowernumber' => $borrowernumber,
-    'type'           => $type,
-    'review'         => $reviewdata,
-       'reviewid'  => $reviewid,
+    'review'         => $clean || $savedreview->{'review'},
+       'reviewid'       => $query->param('reviewid') || 0,
     '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;
-}
-
 output_html_with_http_headers $query, $cookie, $template->output;