lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17616 from piernov/11.0-fix-LDAPposixAccount

Browse Source 
Fix LDAP synchronisation for User class when using posixAccount objectclass
This commit is contained in:
Laurent Destailleur 2021-05-17 09:08:50 +02:00 committed by GitHub
commit 847e4ae4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/user/class/user.class.php
View File

@ -2795,10 +2795,10 @@ class User extends CommonObject
if (!empty($conf->global->LDAP_FIELD_USERID)) { if (!empty($conf->global->LDAP_FIELD_USERID)) {
$info[$conf->global->LDAP_FIELD_USERID] = $this->id; $info[$conf->global->LDAP_FIELD_USERID] = $this->id;
} }
if (!empty($info[$conf->global->LDAP_FIELD_GROUPID])) { if (!empty($conf->global->LDAP_FIELD_GROUPID)) {
$usergroup = new UserGroup($this->db); $usergroup = new UserGroup($this->db);
$groupslist = $usergroup->listGroupsForUser($this->id); $groupslist = $usergroup->listGroupsForUser($this->id);
$info[$conf->global->LDAP_FIELD_GROUPID] = '1'; $info[$conf->global->LDAP_FIELD_GROUPID] = '65534';
if (!empty($groupslist)) { if (!empty($groupslist)) {
foreach ($groupslist as $groupforuser) { foreach ($groupslist as $groupforuser) {
$info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id; //Select first group in list $info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id; //Select first group in list
@ -2806,8 +2806,8 @@ class User extends CommonObject
} }
} }
} }
if (!empty($this->firstname) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) { if (!empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) {
$info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname"; $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->login";
} }
return $info; return $info;