thomas: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php.in, 1.7, 1.8 index.php.in, 1.2, 1.3

cvs at kolab.org cvs at kolab.org
Wed Nov 21 19:11:39 CET 2007


Author: thomas

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

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


Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- admin.php.in	28 May 2007 19:24:10 -0000	1.7
+++ admin.php.in	21 Nov 2007 18:11:37 -0000	1.8
@@ -58,13 +58,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 = substr($cn, 0, $b - $a);
-    }
-  }
+  $firstname = KolabLDAP::getGivenName($cn, $lastname);
   if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];
   else $uid = $ldap_object['uid'];
   $form->entries['firstname']['value'] = $firstname;

Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	29 May 2007 15:07:06 -0000	1.2
+++ index.php.in	21 Nov 2007 18:11:37 -0000	1.3
@@ -81,9 +81,7 @@
 		if( $userid != 'manager' ) {
 		  $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);
 		  // skip admins and maintainers
 		  if( array_key_exists( $dn, $maintainers ) ) {
 			$entries[] = array( 'dn' => $dn,





More information about the commits mailing list