Bug 10403: (follow-up) fix test to use vendor created earlier during test

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

diff --git a/opac/opac-review.pl b/opac/opac-review.pl
index 9f9722e..16ed56a 100755 (executable)
--- a/opac/opac-review.pl
+++ b/opac/opac-review.pl
@@ -13,50 +13,68 @@
 # 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;
-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",
         query           => $query,
         type            => "opac",
-        authnotrequired => 1,
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
     }
 );
 
-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); }
+               }
+       }
 }
-elsif ( $type eq 'update' ) {
-    updatereview( $biblionumber, $borrowernumber, $review );
-}
-$type = ($savedreview) ? "update" : "save";
+(@errors   ) and $template->param(   ERRORS=>\@errors);
+($cgi_debug) and $template->param(cgi_debug=>1       );
 $template->param(
     'biblionumber'   => $biblionumber,
     'borrowernumber' => $borrowernumber,
-    'type'           => $type,
-    'review'         => $savedreview->{'review'},
-       'reviewid'       => $reviewid,
+    'review'         => $clean || $savedreview->{'review'},
+       'reviewid'       => $query->param('reviewid') || 0,
     'title'          => $biblio->{'title'},
 );