error admin_user.php nick or email already exits

fsr-de · Jan 13, 2024 · b20124e · b20124e
1 parent 4d1502d
commit b20124e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
@@ -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();

diff --git a/resources/lang/en_US/additional.po b/resources/lang/en_US/additional.po
@@ -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."