From e6e12e31fb82cf3ad03077c058a09111363f63c4 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 20 Dec 2006 18:13:58 +0000 Subject: [PATCH] ajout commentaire et modification traduction --- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/lib/ldap.class.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 36aa2e2164b..5eaa231468d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -567,7 +567,7 @@ LDAPLdapMapping=LDAP Mapping LDAPFieldLoginUnix=Login (unix) LDAPFieldLoginExample=Example : uid LDAPFilterConnection=Search filter -LDAPFilterConnectionExample=Example : &(objectClass=user)(objectCategory=person) +LDAPFilterConnectionExample=Example : (&(objectClass=user)(objectCategory=person)) LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Example : samaccountname LDAPFieldFullname=Firstname Name diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 08f29d2342d..93912cbfe32 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -567,7 +567,7 @@ LDAPLdapMapping=Mapping LDAP LDAPFieldLoginUnix=Login (unix) LDAPFieldLoginExample=Exemple : uid LDAPFilterConnection=Filtre de recherche -LDAPFilterConnectionExample=Exemple : &(objectClass=user)(objectCategory=person) +LDAPFilterConnectionExample=Exemple : (&(objectClass=user)(objectCategory=person)) LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Exemple : samaccountname LDAPFieldFullname=Prénom Nom diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index 6377ea30d19..74eae5ad285 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -730,6 +730,7 @@ class Ldap $this->bindauth($this->searchUser, $this->searchPassword); } + //permet de choisir le filtre adequat if ($activefilter == 1) { $filter = $this->filter;