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

Manage default value for mailLDAPFilter (#513)

Browse Source
This commit is contained in:
Clément Oudot 2013-06-02 21:53:11 +00:00
parent 35530d93f8
commit 15d520c304
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
View File

@ -551,8 +551,7 @@ sub setDefaultValues {
$self->{cookieName} ||= "lemonldap"; $self->{cookieName} ||= "lemonldap";
$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";
@ -750,9 +749,9 @@ sub buildHiddenForm {
# Build hidden input HTML code # Build hidden input HTML code
$val .= $val .=
'<input type="hidden" name="' '<input type="hidden" name="'
. $_ . $_
. '" id="' . '" id="'
. $_ . $_
. '" value="' . '" value="'
. $self->{portalHiddenFormValues}->{$_} . '" />'; . $self->{portalHiddenFormValues}->{$_} . '" />';

13
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDBLDAP.pm
View File

@ -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' );