thomas: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php.in, 1.4, 1.5 user.php.in, 1.25, 1.26

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	index.php.in user.php.in 
Log Message:
Fix kolab/issue1711 (extra space after first name when editing users or admins)


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php.in	31 Jul 2006 02:03:10 -0000	1.4
+++ index.php.in	21 Nov 2007 18:11:37 -0000	1.5
@@ -144,9 +144,7 @@
         $mail = $attrs['mail'][0];
         $sn = $attrs['sn'][0];
         $cn = $attrs['cn'][0];
-        $a = strlen($sn);
-        $b = strlen($cn);
-        $fn = substr($cn, 0, $b - $a);
+        $fn = KolabLDAP::getGivenName($cn, $sn);
 		$dncomp = split( ',', $dn );
 		if( in_array('cn=groups',$dncomp) ) {
 		  $type = 'G';

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- user.php.in	21 Nov 2007 11:59:56 -0000	1.25
+++ user.php.in	21 Nov 2007 18:11:37 -0000	1.26
@@ -219,13 +219,7 @@
   else $sn = $ldap_object['sn'];
   if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
   else $cn = $ldap_object['cn'];
-  if ($sn) {
-    $a = strlen($sn);
-    if ($cn) {
-      $b = strlen($cn);
-      $givenname = substr($cn, 0, $b - $a);
-    }
-  }
+  if ($cn && $sn) $givenname = KolabLDAP::getGivenName($cn, $sn);
   if (is_array($ldap_object['mail'])) $mail = $ldap_object['mail'][0];
   else $mail = $ldap_object['mail'];
   if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];