extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 19:33:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixing the fix ;-)

Browse Source 
adding the addressbook object classes only when adding new accounts"
This commit is contained in:
Ralf Becker 2009-08-22 07:51:55 +00:00
parent 1628c09432
commit ceaf32919f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,17 +173,6 @@ class accounts_ldap
{ {
$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']); $this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
} }
if (isset($this->requiredObjectClasses['user-if-supported']))
{
foreach($this->requiredObjectClasses['user-if-supported'] as $additional)
{
if ($this->ldapServerInfo->supportsObjectClass($additional))
{
$this->requiredObjectClasses['user'][] = $additional;
}
}
unset($this->requiredObjectClasses['user-if-supported']); // to run this check only once
}
// common code for users and groups // common code for users and groups
// checks if accout_lid (dn) has been changed or required objectclass'es are missing // checks if accout_lid (dn) has been changed or required objectclass'es are missing
if ($data_utf8['account_id'] && $data_utf8['account_lid']) if ($data_utf8['account_id'] && $data_utf8['account_lid'])
@ -243,6 +232,16 @@ class accounts_ldap
{ {
$to_write['objectclass'] = $old ? $old['objectclass'] : array(); $to_write['objectclass'] = $old ? $old['objectclass'] : array();
} }
if (!$old) // for new accounts add additional addressbook object classes, if supported by server
{ // as setting them later might loose eg. password, if we are not allowed to read them
foreach($this->requiredObjectClasses['user-if-supported'] as $additional)
{
if ($this->ldapServerInfo->supportsObjectClass($additional))
{
$to_write['objectclass'][] = $additional;
}
}
}
$to_write['objectclass'] = array_values(array_unique(array_merge($to_write['objectclass'], $to_write['objectclass'] = array_values(array_unique(array_merge($to_write['objectclass'],
$this->requiredObjectClasses[$is_group ? 'group' : 'user']))); $this->requiredObjectClasses[$is_group ? 'group' : 'user'])));
} }