gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php.in, 1.10, 1.11

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	admin.php.in 
Log Message:
kolab/issue4516 (Various logic/spelling fixes for the web admin)

Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- admin.php.in	12 Jul 2010 21:22:09 -0000	1.10
+++ admin.php.in	23 Aug 2010 17:13:44 -0000	1.11
@@ -179,6 +179,7 @@
    if( $form->isSubmitted() ) {
      if( !$form->validate() ) {
        $form->setValues();
+	   if ($action != "firstsave") fill_form_for_modify( $form, $ldap_object );
        $content = $form->outputForm();
      } else {
        debug("Process...");
@@ -246,6 +247,7 @@
 		 $form->entries['password_0']['value'] = '';
 		 $form->entries['password_1']['value'] = '';
 		 $form->entries['action']['value'] = 'save';
+		 $form->entries['uid']['attrs'] = 'readonly';
 		 $content = $form->outputForm();
 		 break;
        } else {