gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.16, 1.17

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv14316/kolab-webadmin/www/admin/user

Modified Files:
	user.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at 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


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- user.php.in	20 Feb 2007 15:42:39 -0000	1.16
+++ user.php.in	16 Mar 2007 12:17:24 -0000	1.17
@@ -656,22 +656,30 @@
 			   unset($explodeddn['count']);
 			   unset($explodeddn[0]);
 			   $tmpbasedn = join(",",$explodeddn);			   
-			   if ( !$errors && !ldap_rename($ldap->connection,$dn,$tmprdn,$tmpbasedn,false) ) {
-				 array_push($errors, sprintf(_("LDAP Error: Could not rename %1\$s to %2\$s: %3\$s"), $dn, $tmprdn,
-											 ldap_error($ldap->connection)));
-			   }
-			   if ( !$errors && !ldap_add($ldap->connection,$newdn, $ldap_object) ) {
-				 array_push($errors, sprintf(_("LDAP Error: Could not rename %1\$s to %2\$s: %3\$s"), $dn, $newdn,
-											 ldap_error($ldap->connection)));
-			   }
-			   if( !$errors ) {
-				 if( !ldap_delete($ldap->connection,$tmprdn.','.$tmpbasedn)) {
-				   array_push($errors, sprintf(_("LDAP Error: Could not remove old entry %s,%s: %s"), 
-											   $tmprdn, $tmpbasedn,
-											   ldap_error($ldap->connection)));
+
+			   if ( !$errors ) {
+				 // Try to rename the object
+				 if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $domain_dn, true)) {
+				   array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											   $newdn, ldap_error($ldap->connection)));
+				 }
+				 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($domain_dn) - 1);
+					 ldap_rename($ldap->connection, $newdn, $old_dn, $domain_dn, true);
+				   } else {
+					 // everything is fine and we can move on
+					 $messages[] = sprintf( _("%s successfully updated"), $newdn);
+					 $dn = $newdn;
+				   }
 				 }
+				 $dn = $newdn;
 			   }
-			   $dn = $newdn;
 			 } else array_push($errors, sprintf(_("LDAP Error: Could not read %s: %s"), $dn,
 												ldap_error($ldap->connection)));
 		   } else {