thomas: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.14, 1.15 index.php.in, 1.3, 1.4

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/domainmaintainer
In directory doto:/tmp/cvs-serv30801/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer

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


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- domainmaintainer.php.in	7 Aug 2007 11:56:56 -0000	1.14
+++ domainmaintainer.php.in	21 Nov 2007 18:11:37 -0000	1.15
@@ -61,13 +61,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/domainmaintainer/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	29 May 2007 15:07:06 -0000	1.3
+++ index.php.in	21 Nov 2007 18:11:37 -0000	1.4
@@ -79,9 +79,7 @@
         $userid = $attrs['uid'][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);
 		// skip admins and maintainers
 		if( array_key_exists( $dn, $maintainers ) ) {
 		  $domains = $ldap->domainsForMaintainerDn($dn);





More information about the commits mailing list