gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.31, 1.32

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	user.php.in 
Log Message:
kolab/issue606 (It is not possible to register people with middlename correctly) 

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- user.php.in	15 Jan 2010 15:38:47 -0000	1.31
+++ user.php.in	28 Jun 2010 13:50:22 -0000	1.32
@@ -273,11 +273,14 @@
   if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
   else $cn = $ldap_object['cn'];
   if ($cn && $sn) $givenname = KolabLDAP::getGivenName($cn, $sn);
+  if (is_array($ldap_object['initials'])) $initials = $ldap_object['initials'][0];
+  else $initials = $ldap_object['initials'];
   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];
   else $uid = $ldap_object['uid'];
   if(array_key_exists('givenname',$form->entries)) $form->entries['givenname']['value'] = $givenname;
+  if(array_key_exists('initials',$form->entries)) $form->entries['initials']['value'] = $initials;
   if(array_key_exists('sn',$form->entries)) $form->entries['sn']['value'] = $sn;
   if(array_key_exists('password_0',$form->entries))  $form->entries['password_0']['value'] = '';
   if(array_key_exists('password_1',$form->entries))  $form->entries['password_1']['value'] = '';
@@ -446,6 +449,7 @@
 $entries = array( 'givenname' => array( 'name' => _('First Name'),
 					'validation' => 'notempty',
 					'comment' => _('Required') ),
+		  'initials' => array( 'name' => _('Middle Name')),
 		  'sn' => array( 'name' => _('Last Name'),
 				       'validation' => 'notempty',
 				       'comment' => _('Required') ),
@@ -517,8 +521,9 @@
 				       'validation' => 'checkquota');
 } else {
   $entries['givenname']['attrs'] = 'readonly';
-  $entries['sn']['attrs'] = 'readonly';
   $entries['givenname']['comment'] = '';
+  $entries['initials']['attrs'] = 'readonly';
+  $entries['sn']['attrs'] = 'readonly';
   $entries['sn']['comment'] = '';
   $entries['alias']['attrs'] = 'readonly';
   $entries['kolabdelegate']['attrs'] = 'readonly';
@@ -565,6 +570,11 @@
        $ldap_object['sn'] = trim($_POST['sn']);
        $ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
 	   $ldap_object['givenName'] = trim($_POST['givenname']);
+	   if (!empty($_POST['initials'])) {
+		 $ldap_object['initials'] = trim($_POST['initials']);
+	   } else {
+		 $ldap_object['initials'] = array();
+	   }
        if( !empty( $_POST['password_0'] ) ) {
 	         $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt());
 		 if( $action == 'save' && $auth->dn() == $dn ) {