holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fixed not working modification of contact with cn= dn"

Browse Source
This commit is contained in:
Ralf Becker 2007-06-03 11:07:50 +00:00
parent 03cf41c5ba
commit 1828683be2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/inc/class.so_ldap.inc.php
View File

@ -358,6 +358,7 @@ class so_ldap
'(|(entryUUID='.ldap::quote($contactUID).')(uid='.ldap::quote($contactUID).'))', $attributes)) && '(|(entryUUID='.ldap::quote($contactUID).')(uid='.ldap::quote($contactUID).'))', $attributes)) &&
($oldContactInfo = ldap_get_entries($this->ds, $result)) && $oldContactInfo['count']) ($oldContactInfo = ldap_get_entries($this->ds, $result)) && $oldContactInfo['count'])
{ {
unset($oldContactInfo[0]['objectclass']['count']);
foreach($oldContactInfo[0]['objectclass'] as $objectclass) foreach($oldContactInfo[0]['objectclass'] as $objectclass)
{ {
$oldObjectclasses[] = strtolower($objectclass); $oldObjectclasses[] = strtolower($objectclass);
@ -431,7 +432,7 @@ class so_ldap
{ {
if (!@ldap_mod_add($this->ds, $dn, array('objectClass' => $ldapContact['objectClass']))) if (!@ldap_mod_add($this->ds, $dn, array('objectClass' => $ldapContact['objectClass'])))
{ {
if(ldap_errno($this->ds) == 69) if(in_array(ldap_errno($this->ds),array(69,20)))
{ {
// need to modify structural objectclass // need to modify structural objectclass
$needRecreation = true; $needRecreation = true;