gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 18025: Simplify logic and avoid 1 call to ValidateBorrowernumber 

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
This is fine with me.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a471ad80bb)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
This commit is contained in:
Jonathan Druart 2017-02-15 17:14:11 +00:00 committed by Katrin Fischer
parent c9ee7be254
commit 7ee00feb70
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opac/opac-password-recovery.pl
View File

@ -90,16 +90,14 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) {
}
# Check if a password reset already issued for this borrower AND we are not asking for a new email
elsif ( ValidateBorrowernumber( $borrower->borrowernumber )
&& !$query->param('resendEmail') )
{
$hasError = 1;
$errAlreadyStartRecovery = 1;
}
elsif ( !ValidateBorrowernumber($borrower->borrowernumber)
&& !$query->param('resendEmail') )
{
DeleteExpiredPasswordRecovery($borrower->borrowernumber);
elsif ( not $query->param('resendEmail') ) {
if ( ValidateBorrowernumber( $borrower->borrowernumber ) ) {
$hasError = 1;
$errAlreadyStartRecovery = 1;
}
else {
DeleteExpiredPasswordRecovery( $borrower->borrowernumber );
}
}
}
else { # 0 matching borrower