Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6768

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-09-19 14:38:07 -04:00
parent 27a90b7a78
commit 669a5135e1
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en-GB/admin/manage/users.json
View File

@@ -93,7 +93,7 @@
"alerts.error-x": "<strong>Error</strong><p>%1</p>", "alerts.error-x": "<strong>Error</strong><p>%1</p>",
"alerts.create-success": "User created!", "alerts.create-success": "User created!",
"alerts.prompt-email": "Email: ", "alerts.prompt-email": "Emails: ",
"alerts.email-sent-to": "An invitation email has been sent to %1", "alerts.email-sent-to": "An invitation email has been sent to %1",
"alerts.x-users-found": "%1 user(s) found! Search took %2 ms." "alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
} }

1
public/language/en-GB/users.json
View File

@@ -10,6 +10,7 @@
"filter-by": "Filter By", "filter-by": "Filter By",
"online-only": "Online only", "online-only": "Online only",
"invite": "Invite", "invite": "Invite",
"prompt-email": "Emails:",
"invitation-email-sent": "An invitation email has been sent to %1", "invitation-email-sent": "An invitation email has been sent to %1",
"user_list": "User List", "user_list": "User List",
"recent_topics": "Recent Topics", "recent_topics": "Recent Topics",

2
public/src/client/users.js
View File

@@ -130,7 +130,7 @@ define('forum/users', ['translator', 'benchpress'], function (translator, Benchp
function handleInvite() { function handleInvite() {
$('[component="user/invite"]').on('click', function () { $('[component="user/invite"]').on('click', function () {
bootbox.prompt('Email: ', function (email) { bootbox.prompt('[[users:prompt-email]]', function (email) {
if (!email) { if (!email) {
return; return;
} }

12
src/socket.io/user.js
View File

@@ -289,21 +289,19 @@ SocketUser.invite = function (socket, email, callback) {
return next(new Error('[[error:no-privileges]]')); return next(new Error('[[error:no-privileges]]'));
} }
var max = parseInt(meta.config.maximumInvites, 10);
if (!max) {
return user.sendInvitationEmail(socket.uid, email, callback);
}
async.waterfall([ async.waterfall([
function (next) { function (next) {
user.getInvitesNumber(socket.uid, next); user.getInvitesNumber(socket.uid, next);
}, },
function (invites, next) { function (invites, next) {
if (!isAdmin && invites >= max) { var max = parseInt(meta.config.maximumInvites, 10);
if (!isAdmin && max && invites >= max) {
return next(new Error('[[error:invite-maximum-met, ' + invites + ', ' + max + ']]')); return next(new Error('[[error:invite-maximum-met, ' + invites + ', ' + max + ']]'));
} }
email = email.split(',').map(email => email.trim()).filter(Boolean);
async.eachSeries(email, function (email, next) {
user.sendInvitationEmail(socket.uid, email, next); user.sendInvitationEmail(socket.uid, email, next);
}, next);
}, },
], next); ], next);
}, },