summaryrefslogtreecommitdiff
path: root/www/admin/addressbook
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2007-03-16 12:17:24 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2007-03-16 12:17:24 (GMT)
commit73cfd70c6291d1e137fa53b8f7e576e3d1ca9c3c (patch)
treec85f9cabc7ae0e17b3b51da1e8952405b0cc791b /www/admin/addressbook
parent024d0e5ead0c3f2606e2cd51aa9396230dbd14bb (diff)
downloadkolab-webadmin-73cfd70c6291d1e137fa53b8f7e576e3d1ca9c3c.tar.gz
2007-03-16 Gunnar Wrobel <p@rdus.de>
* www/admin/user/user.php.in: * www/admin/sharedfolder/sf.php.in: * www/admin/maintainer/maintainer.php.in: * www/admin/domainmaintainer/domainmaintainer.php.in: * www/admin/distributionlist/list.php.in: * www/admin/administrator/admin.php.in: * www/admin/addressbook/addr.php.in: Fixed for the new LDAP overlays introduced in http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10 Tries to fix the following issues: https://intevation.de/roundup/kolab/issue1614 https://intevation.de/roundup/kolab/issue1652 https://intevation.de/roundup/kolab/issue1654
Diffstat (limited to 'www/admin/addressbook')
-rw-r--r--www/admin/addressbook/addr.php.in23
1 files changed, 19 insertions, 4 deletions
diff --git a/www/admin/addressbook/addr.php.in b/www/admin/addressbook/addr.php.in
index bb956dd..3b42c09 100644
--- a/www/admin/addressbook/addr.php.in
+++ b/www/admin/addressbook/addr.php.in
@@ -204,13 +204,28 @@ if( !$errors ) {
($entry=ldap_first_entry($ldap->connection,$result)) &&
($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
- if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
+
+ // Try to rename the object
+ if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $addressbook_root, true)) {
array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
$newdn, ldap_error($ldap->connection)));
- } else {
- $messages[] = sprintf( _("%s successfully updated"), $newdn);
}
- $dn = $newdn;
+ if( !$errors ) {
+ // Renaming was ok, now try to modify the object accordingly
+ if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+ // While this should not happen, in case it does, we need to revert the
+ // renaming
+ array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+ ldap_error($ldap->connection)));
+ $old_dn = substr($dn, 0, strlen($dn) - strlen($addressbook_root) - 1);
+ ldap_rename($ldap->connection, $newdn, $old_dn, $addressbook_root, true);
+ } else {
+ // everything is fine and we can move on
+ $messages[] = sprintf( _("%s successfully updated"), $newdn);
+ $dn = $newdn;
+ }
+ }
+
} else {
array_push($errors,sprintf(_("LDAP Error: could not read %s: %s"), $dn,
ldap_error($ldap->connection)));