iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

error admin_user.php nick or email already exits

This commit is contained in:
Xu 2024-01-13 15:07:40 +01:00 committed by Igor Scheller
parent 4d1502d092
commit b20124e57e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/pages/admin_user.php
View File

@ -289,18 +289,26 @@ function admin_user()
$user_source = User::find($user_id);
$changed_email = false;
$email = $request->postData('eemail');
if (($user_source->email !== $email) && User::whereEmail($email)->exists()) {
$html .= error(__('settings.profile.email.already-taken') . "\n", true);
break;
}
if ($user_source->settings->email_human) {
$changed_email = $user_source->email !== $request->postData('eemail');
$user_source->email = $request->postData('eemail');
$changed_email = $user_source->email !== $email;
$user_source->email = $email;
}
$changed_nick = false;
$nick = trim((string) $request->get('eNick'));
$nickValid = (new Username())->validate($nick);
$changed_nick = false;
if (($user_source->name !== $nick) && User::whereName($nick)->exists()) {
$html .= error(__('settings.profile.nick.already-taken') . "\n", true);
break;
}
$old_nick = $user_source->name;
if ($nickValid && $user_edit) {
$changed_nick = $user_source->name !== $nick;
$changed_nick = ($user_source->name !== $nick) || User::whereName($nick)->exists();
$user_source->name = $nick;
}
$user_source->save();

2
resources/lang/en_US/additional.po
View File

@ -120,7 +120,7 @@ msgid "news.comment-delete.success"
msgstr "Comment successfully deleted."
msgid "news.edit.duplicate"
msgstr "Diese News wurde bereits erstellt."
msgstr "This news has already been created."
msgid "news.edit.success"
msgstr "News successfully updated."