thomas: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php.in, 1.8, 1.9 index.php.in, 1.2, 1.3

[cvs at kolab.org]

Author: thomas

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

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


Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- addr.php.in	12 Jul 2007 16:28:23 -0000	1.8
+++ addr.php.in	21 Nov 2007 18:11:37 -0000	1.9
@@ -24,13 +24,7 @@
   else $lastname = $ldap_object['sn'];
   if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
   else $cn = $ldap_object['cn'];
-  if ($lastname) {
-    $a = strlen($lastname);
-    if ($cn) {
-      $b = strlen($cn);
-      $firstname = trim(substr($cn, 0, $b - $a));
-    }
-  }
+  $firstname = KolabLDAP::getGivenName($cn, $lastname);
   if (is_array($ldap_object['mail'])) $mail_0 = $ldap_object['mail'][0];
   else $mail_0 = $ldap_object['mail'];
   $form->entries['firstname']['value'] = $firstname;

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	29 Mar 2006 10:52:14 -0000	1.2
+++ index.php.in	21 Nov 2007 18:11:37 -0000	1.3
@@ -93,18 +93,16 @@
 	  while( $entry ) {
 		$attrs = ldap_get_attributes($ldap->connection, $entry);
 		$dn = ldap_get_dn($ldap->connection,$entry);
-        $mail = $attrs['mail'][0];
-        $sn = $attrs['sn'][0];
-        $cn = $attrs['cn'][0];
-        $a = strlen($sn);
-        $b = strlen($cn);
-        $fn = substr($cn, 0, $b - $a);
+		$mail = $attrs['mail'][0];
+		$sn = $attrs['sn'][0];
+		$cn = $attrs['cn'][0];
+		$fn = KolabLDAP::getGivenName($cn, $sn);
 		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$entries[] = array( 'dn' => $dn,
 							'sn' => $sn,
 							'fn' => $fn,
 							'mail' => $mail,
-							'deleted' => $deleted );		
+							'deleted' => $deleted );
 		$entry = ldap_next_entry( $ldap->connection,$entry );
 	  }
 	}