diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 240380569d2..6f41480e583 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -21,11 +21,11 @@ */ /** - \file htdocs/admin/ldap_members.php - \ingroup ldap adherent - \brief Page d'administration/configuration du module Ldap adherent - \version $Id$ -*/ + * \file htdocs/admin/ldap_members.php + * \ingroup ldap adherent + * \brief Page d'administration/configuration du module Ldap adherent + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -285,7 +285,7 @@ print ''; $var=!$var; print ''.$langs->trans("LDAPFieldCountry").''; print ''; -print ''.$langs->trans("LDAPFieldCountryExample").''; +print ' '; print ' '; print ''; diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index 0ddeeecb9bb..d3f4f17d759 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -645,6 +645,7 @@ class Ldap $content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n"; $content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n"; $content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n"; + if (in_array('localhost',$this->server)) $content.="# If commands fails to connect, try without -h and -p\n"; $content.="dn: ".$dn."\n"; foreach($info as $key => $value) { @@ -697,7 +698,7 @@ class Ldap // 2.4 Attribute methods ----------------------------------------------------- - + /** * \brief Add a LDAP attribute in entry * \param dn DN entry key @@ -748,7 +749,7 @@ class Ldap return -1; } } - + /** * \brief Update a LDAP attribute in entry * \param dn DN entry key @@ -799,7 +800,7 @@ class Ldap return -1; } } - + /** * \brief Delete a LDAP attribute in entry * \param dn DN entry key @@ -850,12 +851,12 @@ class Ldap return -1; } } - + /** * Returns an array containing attributes and values for first record */ function getAttribute($dn,$filter) - { + { // Check parameters if (! $this->connection) { @@ -867,7 +868,7 @@ class Ldap $this->error="NotConnected"; return -3; } - + $search = ldap_search($this->connection,$dn,$filter); // Only one entry should ever be returned