Branch '2.3-stable' - kolab-webadmin/kolab-webadmin

[Git Service User]

 kolab-webadmin/kolab-webadmin/www/admin/user/user.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 04012190cc9884b312b8df477cf7f63d2068dfcb
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Apr 15 15:58:58 2011 +0200

    kolab-webadmin: kolab/issue1549 (Patch to change dn: cn=... -> dn: mail=...)

diff --git a/kolab-webadmin/kolab-webadmin/www/admin/user/user.php b/kolab-webadmin/kolab-webadmin/www/admin/user/user.php
index 7c00de3..7ba9d27 100644
--- a/kolab-webadmin/kolab-webadmin/www/admin/user/user.php
+++ b/kolab-webadmin/kolab-webadmin/www/admin/user/user.php
@@ -662,7 +662,7 @@ switch( $action ) {
 	   
        if ($action == "save") {
 		 if (!$errors) {
-		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$domain_dn;
+		   if (!empty($ldap_object['uid'])) $newdn = "uid=".$ldap->dn_escape($ldap_object['uid']).",".$domain_dn;
 		   else $newdn = $dn;
 		   if (strcmp($dn,$newdn) != 0) {
 			 // Check for distribution lists with this user as member
@@ -771,7 +771,7 @@ switch( $action ) {
        } else {
 		 // firstsave
 		 if (!$errors) {
-		   $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).$dn_add.",".$domain_dn;
+		   $dn = "uid=".$ldap->dn_escape($ldap_object['uid']).$dn_add.",".$domain_dn;
 		   foreach( $ldap_object as $k => $v ) {
 			 if( $v == array() ) unset($ldap_object[$k]);
 		   }