diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang index 3ff594f7f97..e0925ce956d 100644 --- a/htdocs/langs/fr_FR/ldap.lang +++ b/htdocs/langs/fr_FR/ldap.lang @@ -1,4 +1,5 @@ # Dolibarr language file - fr_FR - ldap +DomainPassword=Mot de passe du domaine UserMustChangePassNextLogon=L'utilisateur doit changer de mot de passe à la prochaine connexion LdapUacf_NORMAL_ACCOUNT=Compte Utilisateur LdapUacf_DONT_EXPIRE_PASSWORD=Le mot de passe n'expire jamais diff --git a/htdocs/lib/authldap.lib.php b/htdocs/lib/authldap.lib.php index ee14afaa430..9398164db0e 100644 --- a/htdocs/lib/authldap.lib.php +++ b/htdocs/lib/authldap.lib.php @@ -118,7 +118,7 @@ class AuthLdap { $this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION; $this->dn = $conf->global->LDAP_SERVER_DN; $this->serverType = $conf->global->LDAP_SERVER_TYPE; - $this->domain = $sDomain; //Todo: ajouter en base + $this->domain = $conf->global->LDAP_SERVER_DN; $this->searchUser = $conf->global->LDAP_ADMIN_DN; $this->searchPassword = $conf->global->LDAP_ADMIN_PASS; $this->people = $conf->global->LDAP_USER_DN; @@ -499,8 +499,8 @@ class AuthLdap { } $filter = '('.$this->filter.'('.$this->getUserIdentifier().'='.$search.'))'; - - $this->result = @ldap_search( $this->connection, $this->People, $filter); + + $this->result = @ldap_search( $this->connection, $this->people, $filter); if (!$this->result) { diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 2ec18cdac87..bd84b22fdc6 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -748,6 +748,10 @@ else { print ''.$userChangePassNextLogon.''; } + else + { + print ''.$langs->trans("DomainPassword").''; + } } else {