Bugzilla – Attachment 63750 Details for
Bug 1985
Email notification of new OPAC comments
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 1985: perltidy opac/opac-review.pl
Bug-1985-perltidy-opacopac-reviewpl.patch (text/plain), 5.60 KB, created by
Mark Tompsett
on 2017-05-26 17:51:40 UTC
(
hide
)
Description:
Bug 1985: perltidy opac/opac-review.pl
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2017-05-26 17:51:40 UTC
Size:
5.60 KB
patch
obsolete
>From ab0c01609c4951798241803ba17d85c0041c745d Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 1985
:
33916
|
33918
|
36065
|
36516
|
36517
|
36521
|
36522
|
36613
|
36614
|
36628
|
36629
|
36643
|
36644
|
36645
|
36677
|
36678
|
36720
|
38908
|
38909
|
38910
|
39062
|
63746
|
63747
|
63748
|
63749
|
63750
|
63751
|
63752
|
63761
|
63762
|
63763
|
74760
|
74761
|
74762
|
74763
|
74764
|
74769
|
74770
|
74771
|
91190
|
91191
|
91192
|
91193
|
91194
|
91195
|
91196
|
91197
|
91198
|
91818
|
91819
|
91820
|
91821
|
91822
|
91823