martin: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.11, 1.12

[cvs at intevation.de]

Author: martin

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

Modified Files:
	user.php 
Log Message:
Martin K:. Added UI for freely choosable seperate UID. Works but lacks checks for uniqueness. IMHO
the current way of doing checks shall be made more easy. I am proposing some code later. This makes 
now the seperate UID workable but we still have a segfault in the imapd. (Tassilo is working on it)


Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- user.php	14 Jul 2004 20:59:32 -0000	1.11
+++ user.php	15 Jul 2004 07:15:20 -0000	1.12
@@ -98,6 +98,7 @@
   }
   return '';
 }
+
 function fill_form_for_modify( &$form, $dn, &$ldap_object ) {
   if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];
   else $lastname = $ldap_object['sn'];
@@ -112,13 +113,15 @@
   }
   if (is_array($ldap_object['mail'])) $mail_0 = $ldap_object['mail'][0];
   else $mail_0 = $ldap_object['mail'];
+  if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];
+  else $uid = $ldap_object['uid'];
   $form->entries['firstname']['value'] = $firstname;
   $form->entries['lastname']['value'] = $lastname;
   $form->entries['password_0']['value'] = '';
   $form->entries['password_1']['value'] = '';
   $form->entries['mail_0']['value'] = $mail_0;
   $form->entries['mail_0']['attrs'] = 'readonly';
-
+  $form->entries['uid']['value'] = $uid;
   // accttype
   $dncomp = split( ',', $dn );
   if( in_array('cn=groups',$dncomp) ) {
@@ -247,7 +250,10 @@
 		  'mail_0' => array( 'name' => 'Primary Email Address',
 				     'validation' => 'notempty',
 				     'comment' => $comment_mail_0 ),
-		  'homeserver' => array( 'name' => 'Mailbox Location',
+		  'uid'    => array( 'name' => 'Unique Identity (UID)',
+                                     #'validation' => '',
+                                     'comment' => 'Optional - Defaults to Primary Email Address' ),
+                 'homeserver' => array( 'name' => 'Mailbox Home Server',
 								 'validation' => 'notempty',
 								 'comment' => $comment_homeserver,
 								 'value' => $_SESSION['fqhostname'] ),
@@ -339,8 +345,10 @@
 		 }
        }
        $ldap_object['mail'] = trim( strtolower( $_POST['mail_0'] ) );
+       $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
        if( $action == 'firstsave' ) {
 		 $ldap_object['uid'] = $ldap_object['mail'];
+                 if ($ldap_object['uid'] == "") $ldap_object['uid'] = $ldap_object['mail'];
 		 $ldap_object['homeServer'] = trim($_POST['homeserver']);
 	   }
        foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 'postOfficeBox',