Manage default value for mailLDAPFilter (#513)
This commit is contained in:
parent
35530d93f8
commit
15d520c304
@ -552,7 +552,6 @@ sub setDefaultValues {
|
|||||||
$self->{authentication} ||= 'LDAP';
|
$self->{authentication} ||= 'LDAP';
|
||||||
$self->{authentication} =~ s/^ldap/LDAP/;
|
$self->{authentication} =~ s/^ldap/LDAP/;
|
||||||
$self->{SMTPServer} ||= 'localhost';
|
$self->{SMTPServer} ||= 'localhost';
|
||||||
$self->{mailLDAPFilter} ||= '(&(mail=$mail)(objectClass=inetOrgPerson))';
|
|
||||||
$self->{randomPasswordRegexp} ||= '[A-Z]{3}[a-z]{5}.\d{2}';
|
$self->{randomPasswordRegexp} ||= '[A-Z]{3}[a-z]{5}.\d{2}';
|
||||||
$self->{mailFrom} ||= "noreply@" . $self->{domain};
|
$self->{mailFrom} ||= "noreply@" . $self->{domain};
|
||||||
$self->{mailSubject} ||= "[LemonLDAP::NG] Your new password";
|
$self->{mailSubject} ||= "[LemonLDAP::NG] Your new password";
|
||||||
|
@ -44,9 +44,16 @@ sub formateFilter {
|
|||||||
? $self->{mailLDAPFilter}
|
? $self->{mailLDAPFilter}
|
||||||
: $self->{AuthLDAPFilter}
|
: $self->{AuthLDAPFilter}
|
||||||
|| $self->{LDAPFilter};
|
|| $self->{LDAPFilter};
|
||||||
$self->lmLog( "LDAP submitted filter: " . $self->{LDAPFilter}, 'debug' )
|
if ( $self->{LDAPFilter} ) {
|
||||||
if ( $self->{LDAPFilter} );
|
$self->lmLog( "LDAP submitted filter: " . $self->{LDAPFilter},
|
||||||
$self->{LDAPFilter} ||= '(&(uid=$user)(objectClass=inetOrgPerson))';
|
'debug' );
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$self->{LDAPFilter} =
|
||||||
|
$self->{mail}
|
||||||
|
? '(&(mail=$mail)(objectClass=inetOrgPerson))'
|
||||||
|
: '(&(uid=$user)(objectClass=inetOrgPerson))';
|
||||||
|
}
|
||||||
$self->{LDAPFilter} =~ s/\$(user|_?password|mail)/$self->{$1}/g;
|
$self->{LDAPFilter} =~ s/\$(user|_?password|mail)/$self->{$1}/g;
|
||||||
$self->{LDAPFilter} =~ s/\$(\w+)/$self->{sessionInfo}->{$1}/g;
|
$self->{LDAPFilter} =~ s/\$(\w+)/$self->{sessionInfo}->{$1}/g;
|
||||||
$self->lmLog( "LDAP transformed filter: " . $self->{LDAPFilter}, 'debug' );
|
$self->lmLog( "LDAP transformed filter: " . $self->{LDAPFilter}, 'debug' );
|
||||||
|
Loading…
Reference in New Issue
Block a user