steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.1, 1.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	user.php 
Log Message:
homeServer entry + escaping of vacation text + fix for buggy html-parser in mozilla 1.0

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- user.php	17 May 2004 15:24:27 -0000	1.1
+++ user.php	19 May 2004 22:26:09 -0000	1.2
@@ -146,18 +146,24 @@
 }
 
 // Check auth
-if (!$errors && $auth->group() != "maintainer" && $auth->group() != "admin" &&
-    !($auth->group() == "user" && $dn == $auth->dn() )) {
+if (!$errors && $auth->group() != 'maintainer' && $auth->group() != 'admin' &&
+    !($auth->group() == 'user' && $dn == $auth->dn() )) {
   array_push($errors, "Error: You don't have the required Permissions");
 }   
 
+if( !$errors && $auth->group() == 'user' && ($action == 'firstsave' || $action == 'kill' ) ) {
+  $errors[] = "Error: You don't have the required Permissions";
+}
+
 // Fill in data
 if ($action == "create") {
-  $comment_mail_0 = 'Required, non volatile' ;
+  $comment_mail_0 = 'Required, non volatile';
   $comment_password = 'Required';
+  $comment_homeserver = 'Required, non volatile';
 } else {
-  $comment_mail_0 = 'non volatile' ;
+  $comment_mail_0 = 'Non volatile' ;
   $comment_password = 'Leave blank to keep password unchanged';
+  $comment_homeserver = 'Non volatile';
 }
 
 $entries = array( 'firstname' => array( 'name' => 'First Name',
@@ -177,6 +183,9 @@
 		  'mail_0' => array( 'name' => 'Primary Email Address',
 				     'validation' => 'notempty',
 				     'comment' => $comment_mail_0 ),
+		  'homeserver' => array( 'name' => 'Mailbox Location',
+								 'validation' => 'notempty',
+								 'comment' => $comment_homeserver ),
 		  'title_0' => array( 'name' => 'Title' ) );
 $entries['alias'] = array( 'name' => 'Email Aliases', 
 						   'type' => 'textarea',
@@ -201,6 +210,7 @@
 				 'comment' => 'Leave blank for unlimited' );
 } else {
   $entries['alias']['attrs'] = 'readonly';
+  $entries['homeserver']['attrs'] = 'readonly';
 }
 $entries['action'] = array( 'name' => 'action',
 			    'type' => 'hidden' );
@@ -225,7 +235,7 @@
        $content = $form->outputForm();
      } else {
        $ldap_object = array();
-       $ldap_object['objectClass'] = 'inetOrgPerson';
+       $ldap_object['objectClass'] = 'kInetOrgPerson';
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
 	   $ldap_object['givenName'] = trim($_POST['firstname']);
@@ -234,7 +244,10 @@
 																	sha1( $_POST['password_0'])));
        }
        $ldap_object['mail'] = trim( strtolower( $_POST['mail_0'] ) );
-       if( $action == 'firstsave' ) $ldap_object['uid'] = $ldap_object['mail'];
+       if( $action == 'firstsave' ) {
+		 $ldap_object['uid'] = $ldap_object['mail'];
+		 $ldap_object['homeServer'] = trim($_POST['firstname']);
+	   }
        foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 'postOfficeBox',
 		       'postalCode', 'l', 'c', 'telephoneNumber',
 		       'facsimileTelephoneNumber' ) as $attr ) {