extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ActiveDirectory: fix creation of groups without description or removing of description of an existing group

Browse Source
This commit is contained in:
Ralf Becker 2016-01-26 13:29:30 +00:00
parent a48d100e8e
commit c982167602
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.accounts_ads.inc.php
View File

@ -629,6 +629,10 @@ class accounts_ads
{
switch($egw)
{
case 'account_description':
$ldap[$adldap] = !empty($data[$egw]) ? $data[$egw] : array();
break;
default:
$ldap[$adldap] = $data[$egw];
break;
@ -1590,7 +1594,6 @@ class adLDAPGroups_egw extends adLDAPGroups
if (!is_array($attributes)){ return "Attributes must be an array"; }
if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
if (!array_key_exists("description", $attributes)){ return "Missing compulsory field [description]"; }
if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
//$member_array = array();
@ -1601,7 +1604,7 @@ class adLDAPGroups_egw extends adLDAPGroups
$add["cn"] = $attributes["group_name"];
$add["samaccountname"] = $attributes["group_name"];
$add["objectClass"] = "Group";
$add["description"] = $attributes["description"];
if (!empty($attributes["description"])) $add["description"] = $attributes["description"];
//$add["member"] = $member_array; UNTESTED
// Determine the container