From 6a6f704d02d0ca0ab973afcb6729fa5e47c15f1a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 27 Sep 2017 13:44:00 -0300 Subject: [PATCH] Bug 19366: Do not block patron's detail update if EmailMustBeUnique If the pref PatronSelfRegistrationEmailMustBeUnique is set ("consider"), a patron is not allowed to register with an existing email address. The existing code is wrong and reject a patron that is updating their personal details with "This email address already exists in our database.", even if the patron did not modify their email address. This is caused by the query we made, we must search for patron with this email address but who is not the current patron. Test plan: - Set PatronSelfRegistrationEmailMustBeUnique to "consider" - Register a new patron with an existing email address => you should not be allowed - Use a non-existent email address => You should be allowed - Edit your patron details - Modify some infos => Should pass - Modify your email address with an existing one => You should not be allowed to do that Followed test plan, patches worked as described Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit ae02cf97e469a17d3bdc9d5c7db702960fd620c8) Signed-off-by: Fridolin Somers (cherry picked from commit e23822b869ea66f63ce6c6027e418c79e3c7ba04) Signed-off-by: Katrin Fischer --- opac/opac-memberentry.pl | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 7a734c6..eec490f 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -206,6 +206,7 @@ elsif ( $action eq 'update' ) { }); my %borrower = ParseCgiForBorrower($cgi); + $borrower{borrowernumber} = $borrowernumber; my %borrower_changes = DelEmptyFields(%borrower); my @empty_mandatory_fields = @@ -369,7 +370,17 @@ sub CheckForInvalidFields { unless ( Email::Valid->address($borrower->{'email'}) ) { push(@invalidFields, "email"); } elsif ( C4::Context->preference("PatronSelfRegistrationEmailMustBeUnique") ) { - my $patrons_with_same_email = Koha::Patrons->search( { email => $borrower->{email} })->count; + my $patrons_with_same_email = Koha::Patrons->search( + { + email => $borrower->{email}, + ( + exists $borrower->{borrowernumber} + ? ( borrowernumber => + { '!=' => $borrower->{borrowernumber} } ) + : () + ) + } + )->count; if ( $patrons_with_same_email ) { push @invalidFields, "duplicate_email"; } -- 1.7.2.5