From 3250b698eb09da8c8b300a8f78eee374fbf62536 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 23 Mar 2012 13:14:55 +0100 Subject: [PATCH] Fixing bug when editing the username see #4516 --- main/admin/user_edit.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php index 83540d68d8..bb98a4b915 100644 --- a/main/admin/user_edit.php +++ b/main/admin/user_edit.php @@ -147,7 +147,8 @@ if (strlen($user_data['picture_uri']) > 0) { } // Username -if (api_get_setting('login_is_email') == 'true') { + +if (api_get_setting('login_is_email') != 'true') { $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH)); $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); @@ -419,11 +420,9 @@ if ( $form->validate()) { $url = api_get_access_url($access_url_id); $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $url['url'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator'); } - } - else { + } else { $emailbody=get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username . (($reset_password > 0) ? "\n". get_lang('Pass')." : ".stripslashes($password) : "") . "\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $_configuration['root_web'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator'); } - @api_mail($recipient_name, $email, $emailsubject, $emailbody, $sender_name, $email_admin); } $tok = Security::get_token();