diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 5eaa231468d..36aa2e2164b 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 93912cbfe32..08f29d2342d 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 130773659d5..1a413468cbf 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -733,7 +733,7 @@ class Ldap //permet de choisir le filtre adequat if ($activefilter == 1) { - $filter = $this->filter; + $filter = '('.$this->filter.')'; } else {