From ab0c01609c4951798241803ba17d85c0041c745d Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Fri, 26 May 2017 11:20:50 -0400 Subject: [PATCH] Bug 1985: perltidy opac/opac-review.pl --- opac/opac-review.pl | 82 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/opac/opac-review.pl b/opac/opac-review.pl index a23fc79..fe31a9e 100755 --- a/opac/opac-review.pl +++ b/opac/opac-review.pl @@ -31,8 +31,8 @@ use Koha::Reviews; my $query = CGI->new; my $biblionumber = $query->param('biblionumber'); -my $review = $query->param('review'); # if defined submit -my $reviewid = $query->param('reviewid'); # if defined edit +my $review = $query->param('review'); # if defined submit +my $reviewid = $query->param('reviewid'); # if defined edit my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { template_name => 'opac-review.tt', @@ -47,47 +47,57 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( my ( $clean, @errors, $savedreview, $affectedreview ); my $submitting = ( defined $review && $review ne q{} ) ? 1 : 0; -my $editing = ( defined $reviewid ) ? 1: 0; +my $editing = ( defined $reviewid ) ? 1 : 0; my $biblio = GetBiblioData($biblionumber); -if( !$biblio ) { +if ( !$biblio ) { push @errors, { nobiblio => 1 }; -} elsif( $reviewid ) { # edit existing one, check on creator - $savedreview = Koha::Reviews->search({ reviewid => $reviewid, borrowernumber => $borrowernumber })->next; - if (!$savedreview) { push @errors, { unauthorized => 1 } }; -} else { # this check prevents adding multiple comments - # FIXME biblionumber, borrowernumber should be a unique key of reviews - $savedreview = Koha::Reviews->search({ biblionumber => $biblionumber, borrowernumber => $borrowernumber })->next; - $review = $savedreview? $savedreview->review: $review; +} +elsif ($reviewid) { # edit existing one, check on creator + $savedreview = Koha::Reviews->search( + { reviewid => $reviewid, borrowernumber => $borrowernumber } )->next; + if ( !$savedreview ) { push @errors, { unauthorized => 1 } } +} +else { # this check prevents adding multiple comments + # FIXME biblionumber, borrowernumber should be a unique key of reviews + $savedreview = Koha::Reviews->search( + { biblionumber => $biblionumber, borrowernumber => $borrowernumber } ) + ->next; + $review = $savedreview ? $savedreview->review : $review; } -if( !@errors && $submitting ) { - if ($review !~ /\S/xsm) { - push @errors, {empty=>1}; - } else { +if ( !@errors && $submitting ) { + if ( $review !~ /\S/xsm ) { + push @errors, { empty => 1 }; + } + else { $clean = C4::Scrubber->new('comment')->scrub($review); - if ($clean !~ /\S/xsm) { - push @errors, {scrubbed_all=>1}; - } else { - if ($clean ne $review) { - push @errors, {scrubbed=>$clean}; + if ( $clean !~ /\S/xsm ) { + push @errors, { scrubbed_all => 1 }; + } + else { + if ( $clean ne $review ) { + push @errors, { scrubbed => $clean }; } my $js_ok_review = $clean; - $js_ok_review =~ s/"/"/gx; # probably redundant w/ TMPL ESCAPE=JS - $template->param(clean_review=>$js_ok_review); + $js_ok_review =~ + s/"/"/gx; # probably redundant w/ TMPL ESCAPE=JS + $template->param( clean_review => $js_ok_review ); if ($editing) { my $updatedreview = $savedreview->set( { - review => $clean, - approved => 0, - datereviewed => dt_from_string + review => $clean, + approved => 0, + datereviewed => dt_from_string } )->store; $affectedreview = $updatedreview; - } else { + } + else { my $newreview = Koha::Review->new( - { biblionumber => $biblionumber, + { + biblionumber => $biblionumber, borrowernumber => $borrowernumber, review => $clean, } @@ -96,19 +106,21 @@ if( !@errors && $submitting ) { $affectedreview = $newreview; } if ($reviewid) { - $affectedreview->SendReviewAlert({ - 'borrowernumber' => $borrowernumber, - 'reviewid' => $reviewid, - 'biblionumber' => $biblionumber - }); + $affectedreview->SendReviewAlert( + { + 'borrowernumber' => $borrowernumber, + 'reviewid' => $reviewid, + 'biblionumber' => $biblionumber + } + ); } - if (@errors = 0){ $template->param(WINDOW_CLOSE=>1); } + if ( @errors = 0 ) { $template->param( WINDOW_CLOSE => 1 ); } } } } -(@errors ) and $template->param( ERRORS=>\@errors); -($cgi_debug) and $template->param(cgi_debug=>1 ); +(@errors) and $template->param( ERRORS => \@errors ); +($cgi_debug) and $template->param( cgi_debug => 1 ); $review = $clean; if ($savedreview) { $review ||= $savedreview->review; } $template->param( -- 2.1.4