thomas: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer index.php.in, 1.2, 1.3 maintainer.php.in, 1.9, 1.10
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/maintainer
In directory doto:/tmp/cvs-serv30801/kolab-webadmin/kolab-webadmin/www/admin/maintainer
Modified Files:
index.php.in maintainer.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/maintainer/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
@@ -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 ) ) {
$entries[] = array( 'dn' => $dn,
Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- maintainer.php.in 29 May 2007 15:07:06 -0000 1.9
+++ maintainer.php.in 21 Nov 2007 18:11:37 -0000 1.10
@@ -59,13 +59,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;
More information about the commits
mailing list