steffen: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer maintainer.php, 1.9, 1.10

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	maintainer.php 
Log Message:
fix for issue487 (Changing firstname for admin and maintainer means trouble)

Index: maintainer.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- maintainer.php	20 Sep 2004 11:54:08 -0000	1.9
+++ maintainer.php	26 Oct 2004 02:51:09 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¤lvdalens Datakonsult AB
+ *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¿Ã��½Ã��¯Ã��¿Ã��½Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¯Ã��¿½ï¿½Â¿Ã��¿½ï¿½Â½Ã��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¤lvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -219,6 +219,8 @@
 				 ($entry=ldap_first_entry($ldap->connection,$result)) &&
 				 ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
 			   $ldap_object['uid'] = $oldattrs['uid'][0];
+			   if( empty($ldap_object['userPassword']) )
+				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
 			   if (!ldap_add($ldap->connection,$newdn, $ldap_object) )
 				 array_push($errors, _("LDAP Error: could not rename $dn to $newdn: ")
 							.ldap_error($ldap->connection));
@@ -231,16 +233,16 @@
 			   if( !$errors ) {
 				 // Update maintainer group
 				 $groupdn = 'cn=maintainer,cn=internal,'.$domain_dn;
-				 if( !ldap_mod_delete($ldap->connection,$groupdn,
-									  array( 'member' => $dn ) ) ) {
-				   $errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
-					 .ldap_error($ldap->connection());
-				 }
-				 if( !$errors && ldap_mod_add( $ldap->connection,
+				 if( !ldap_mod_add( $ldap->connection,
 											   $groupdn,
 											   array( 'member' => $newdn ) ) ) {
 				   $errors[] = _("LDAP Error: Could not add new group entry $newdn: ")
-					 .ldap_error($ldap->connection());
+					 .ldap_error($ldap->connection);
+				 }
+				 if( !$errors && !ldap_mod_del($ldap->connection,$groupdn,
+									  array( 'member' => $dn ) ) ) {
+				   $errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
+					 .ldap_error($ldap->connection);
 				 }
 			   }			   
 			   $dn = $newdn;