Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added dump.rdb
Binary file not shown.
2 changes: 1 addition & 1 deletion public/language/en-US/error.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"invalid-path": "Invalid path",
"folder-exists": "Folder exists",
"invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
"username-taken": "Username taken",
"username-taken": "Username taken. Maybe try %1",
"email-taken": "Email address is already taken.",
"email-nochange": "The email entered is the same as the email already on file.",
"email-invited": "Email was already invited",
Expand Down
31 changes: 30 additions & 1 deletion public/src/client/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,43 @@ define('forum/register', [
if (results.every(obj => obj.status === 'rejected')) {
showSuccess(usernameInput, username_notify, successIcon);
} else {
showError(usernameInput, username_notify, '[[error:username-taken]]');
suggestedusernameInput = suggestUserName(usernameInput);

showError(usernameInput, username_notify, '[[error:username-taken, ${suggestedusernameInput}]]');
}

callback();
});
}
}

function suggestUserName(username){
accepted = 0;
suggestedUser = username;
i = 0;

while(accepted != 1){

Promise.allSettled([
api.head(`/users/bySlug/${userslug}`, {}),
api.head(`/groups/${username}`, {}),
]).then((results) => {
if (results.every(obj => obj.status === 'rejected')) {
accepted = 1;
} else {

i += 1;
currentNum = i.ToString();
suggestUser = username.concat(currentNum);
}
});
}
return suggestUser;

}



function validatePassword(password, password_confirm) {
const passwordInput = $('#password');
const password_notify = $('#password-notify');
Expand Down