keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve feedback in mod/settings

Browse source
This commit is contained in:
Hypolite Petovan 2020-03-01 10:15:35 -05:00
parent b1b6533512
commit 7ef3308a8d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/settings.php
View file

@ -252,6 +252,8 @@ function settings_post(App $a)
unlink($_FILES['importcontact-filename']['tmp_name']); unlink($_FILES['importcontact-filename']['tmp_name']);
} }
} }
return;
} }
if (!empty($_POST['resend_relocate'])) { if (!empty($_POST['resend_relocate'])) {
@ -363,17 +365,17 @@ function settings_post(App $a)
if ($username != $a->user['username']) { if ($username != $a->user['username']) {
if (strlen($username) > 40) { if (strlen($username) > 40) {
$err .= DI::l10n()->t(' Please use a shorter name.'); $err .= DI::l10n()->t('Please use a shorter name.');
} }
if (strlen($username) < 3) { if (strlen($username) < 3) {
$err .= DI::l10n()->t(' Name too short.'); $err .= DI::l10n()->t('Name too short.');
} }
} }
if ($email != $a->user['email']) { if ($email != $a->user['email']) {
// check for the correct password // check for the correct password
if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) { if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
$err .= DI::l10n()->t('Wrong Password') . EOL; $err .= DI::l10n()->t('Wrong Password.');
$email = $a->user['email']; $email = $a->user['email'];
} }
// check the email is valid // check the email is valid
@ -391,7 +393,7 @@ function settings_post(App $a)
} }
if (strlen($err)) { if (strlen($err)) {
notice($err . EOL); notice($err);
return; return;
} }