dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid warning if user not defined in log message (#1508)

Browse Source
This commit is contained in:
Clément OUDOT 2018-11-14 11:05:05 +01:00
parent 356a588a92
commit 584b79f30c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm
View File

@ -177,7 +177,6 @@ sub _reset {
}
# Search user in database
#$req->user( $req->{mail} );
$req->steps(
[
'getUser', 'setSessionInfo',
@ -187,8 +186,9 @@ sub _reset {
);
if ( my $error = $self->p->process( $req, useMail => $searchByMail ) ) {
if ( $error == PE_USERNOTFOUND or $error == PE_BADCREDENTIALS ) {
$self->userLogger->warn(
"Reset asked for a unvalid user ($req->{user})");
$self->userLogger->warn( "Reset asked for a unvalid user ("
. $req->param('mail')
. ")" );
# To avoid mail enumeration, return OK
# unless portalErrorOnMailNotFound is set
@ -426,8 +426,10 @@ sub changePwd {
# Populate $req->{user} for logging purpose
my $tmp = $self->conf->{portalRequireOldPassword};
$self->conf->{portalRequireOldPassword} = 0;
$req->user($req->{sessionInfo}->{_user} );
my $result = $self->p->_passwordDB->modifyPassword($req, $req->data->{newpassword},1);
$req->user( $req->{sessionInfo}->{_user} );
my $result =
$self->p->_passwordDB->modifyPassword( $req, $req->data->{newpassword},
1 );
$req->{user} = undef;
# Mail token can be used only one time, delete the session if all is ok
@ -574,9 +576,8 @@ sub display {
$tplPrm{DISPLAY_PASSWORD_FORM} = 1;
}
# Display password change form again if passwords mismatch
elsif ( $req->error == PE_PASSWORDFORMEMPTY )
{
# Display password change form again if passwords mismatch
elsif ( $req->error == PE_PASSWORDFORMEMPTY ) {
$self->logger->debug('Display password form');
$tplPrm{DISPLAY_PASSWORD_FORM} = 1;
}