extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

setting sambaPrimaryGroupSID and univentionObject with univentionObjectType

Browse Source
This commit is contained in:
Ralf Becker 2014-10-31 15:31:32 +00:00
parent 99895e0dd9
commit fd37251ac4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -83,13 +83,14 @@ class accounts_ldap
'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount' 'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
), ),
'user-if-supported' => array( // these classes get added, if server supports them 'user-if-supported' => array( // these classes get added, if server supports them
'mozillaabpersonalpha','mozillaorgperson','evolutionperson','univentionperson' 'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
'univentionperson', array('univentionobject', 'univentionObjectType' => 'users/user'),
), ),
'group' => array( 'group' => array(
'top','posixgroup','groupofnames' 'top','posixgroup','groupofnames'
), ),
'group-if-supported' => array( // these classes get added, if servers supports them 'group-if-supported' => array( // these classes get added, if servers supports them
'univentiongroup', 'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
) )
); );
/** /**
@ -255,9 +256,16 @@ class accounts_ldap
{ // as setting them later might loose eg. password, if we are not allowed to read them { // as setting them later might loose eg. password, if we are not allowed to read them
foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional) foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
{ {
$add = array();
if (is_array($additional))
{
$add = $additional;
$additional = array_shift($add);
}
if ($this->ldapServerInfo->supportsObjectClass($additional)) if ($this->ldapServerInfo->supportsObjectClass($additional))
{ {
$to_write['objectclass'][] = $additional; $to_write['objectclass'][] = $additional;
if ($add) $to_write += $add;
} }
} }
} }