From b8c6e2c6eaed6398f6deaf76f00c141f4f8f25c7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 20 Dec 2006 19:54:46 +0000 Subject: [PATCH] =?UTF-8?q?probl=E8me=20de=20parenth=E8se=20dans=20le=20fi?= =?UTF-8?q?ltre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/lib/ldap.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 {