gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.33, 1.34

[cvs at kolab.org]

Author: gunnar

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

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

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- user.php.in	12 Jul 2010 21:22:09 -0000	1.33
+++ user.php.in	23 Aug 2010 17:13:45 -0000	1.34
@@ -108,7 +108,7 @@
 	  $ok = true;
 	}
   }
-  if(!$ok) return sprintf(_("Email address %1\$s not in domains %2\$s"), $value, join(", ", $domain));
+  if(!$ok) return sprintf(_("Email address %1\$s not in domains %2\$s"), $value, join(", ", $domains));
 
   if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) {	
 	return _('User, vCard or distribution list with this email address already exists');
@@ -553,7 +553,7 @@
   apply_attributeaccess( $entries );
 }
 $form =& new KolabForm( 'user', 'createuser.tpl', $entries );
-/***************** Main action swicth **********************/
+/***************** Main action switch **********************/
 switch( $action ) {
  case 'firstsave':
    debug("adding checkuniquemail to validation");
@@ -562,6 +562,8 @@
  case 'save':
    if( $form->isSubmitted() ) {
      if( !$form->validate() ) {
+	   if($action != "firstsave")
+		fill_form_for_modify($form, $ldap_object);
        $form->setValues();
        $content = $form->outputForm();
      } else {
@@ -819,7 +821,7 @@
 		   $heading = _('Create New User');
 		   $blacklist = array('mail');
 		   $form->entries['action']['value'] = 'firstsave';
-		   $form->outputForm();
+		   $content = $form->outputForm();
 		   break;
 		 }
        }