From 195ac8e8f6d70b60495cc6c2b99d4af2465dfab0 Mon Sep 17 00:00:00 2001
From: Abbes Bahfir <bafbes@gmail.com>
Date: Thu, 12 Sep 2019 11:18:22 +0100
Subject: [PATCH] fix : Tests for attributes exsitence in Use of posixAccount
 and posixGroup objectclass for users and groups in LDAP

---
 htdocs/user/class/user.class.php      | 20 +++++++++++---------
 htdocs/user/class/usergroup.class.php |  4 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index aa4aec74251..ae1d9afa062 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2657,17 +2657,19 @@ class User extends CommonObject
 			if ($this->phone_mobile) $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
 		}
 
-        $info[$conf->global->LDAP_FIELD_USERID] = $this->id;
-        $info[$conf->global->LDAP_FIELD_GROUPID] = '1';
-        $usergroup = new UserGroup($this->db);
-        $groupslist = $usergroup->listGroupsForUser($this->id);
-        if(!empty($groupslist)){
-            foreach ($groupslist as $groupforuser) {
-                $info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id;//Select first group in list
-                break;
+        if (!empty($conf->global->LDAP_FIELD_USERID))$info[$conf->global->LDAP_FIELD_USERID] = $this->id;
+        if(!empty($info[$conf->global->LDAP_FIELD_GROUPID])){
+            $usergroup = new UserGroup($this->db);
+            $groupslist = $usergroup->listGroupsForUser($this->id);
+            $info[$conf->global->LDAP_FIELD_GROUPID] = '1';
+            if(!empty($groupslist)){
+                foreach ($groupslist as $groupforuser) {
+                    $info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id;//Select first group in list
+                    break;
+                }
             }
         }
-        $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY]="{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname";
+        if (!empty($this->firstname) && !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";
 
         return $info;
     }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index c0cd4d9227f..f2194b1d8b7 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -981,7 +981,9 @@ class UserGroup extends CommonObject
 			$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:'');
 
         }
-        $info[$conf->global->LDAP_FIELD_GROUPID]=$this->id;
+        if(!empty($info[$conf->global->LDAP_FIELD_GROUPID])){
+            $info[$conf->global->LDAP_FIELD_GROUPID]=$this->id;
+        }
 		return $info;
 	}