summaryrefslogtreecommitdiff
path: root/www/admin/user/user.php.in
diff options
context:
space:
mode:
Diffstat (limited to 'www/admin/user/user.php.in')
-rw-r--r--www/admin/user/user.php.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/www/admin/user/user.php.in b/www/admin/user/user.php.in
index aa3c455..eeace1d 100644
--- a/www/admin/user/user.php.in
+++ b/www/admin/user/user.php.in
@@ -108,7 +108,7 @@ function checkuniquemail( $form, $key, $value ) {
$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 @@ if( $auth->group() == 'user' ) {
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 @@ switch( $action ) {
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 @@ switch( $action ) {
$heading = _('Create New User');
$blacklist = array('mail');
$form->entries['action']['value'] = 'firstsave';
- $form->outputForm();
+ $content = $form->outputForm();
break;
}
}