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

closes #1710, closes #1700

Browse Source
This commit is contained in:
barisusakli
2014-06-16 14:13:50 -04:00
parent db3523b10b
commit 2479a34c56
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en_GB/notifications.json
View File

@@ -3,7 +3,7 @@
"no_notifs": "You have no new notifications", "no_notifs": "You have no new notifications",
"see_all": "See all Notifications", "see_all": "See all Notifications",
"back_to_home": "Back to NodeBB", "back_to_home": "Back to %1",
"outgoing_link": "Outgoing Link", "outgoing_link": "Outgoing Link",
"outgoing_link_message": "You are now leaving", "outgoing_link_message": "You are now leaving",
"continue_to": "Continue to", "continue_to": "Continue to",

1
src/controllers/api.js
View File

@@ -13,6 +13,7 @@ apiController.getConfig = function(req, res, next) {
var config = {}; var config = {};
config.relative_path = serverConfig.relative_path; config.relative_path = serverConfig.relative_path;
config.version = pkg.version; config.version = pkg.version;
config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB';
config.postDelay = meta.config.postDelay; config.postDelay = meta.config.postDelay;
config.minimumTitleLength = meta.config.minimumTitleLength; config.minimumTitleLength = meta.config.minimumTitleLength;
config.maximumTitleLength = meta.config.maximumTitleLength; config.maximumTitleLength = meta.config.maximumTitleLength;

15
src/user.js
View File

@@ -155,22 +155,29 @@ var bcrypt = require('bcryptjs'),
}, },
exists: function(next) { exists: function(next) {
db.exists('user:' + uid, next); db.exists('user:' + uid, next);
},
isAdmin: function(next) {
User.isAdministrator(uid, next);
} }
}, function(err, results) { }, function(err, results) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
if (!results.exists) {
return callback(new Error('[[error:no-user]]'));
}
if (results.isAdmin) {
return callback();
}
var userData = results.userData; var userData = results.userData;
if (parseInt(userData.banned, 10) === 1) { if (parseInt(userData.banned, 10) === 1) {
return callback(new Error('[[error:user-banned]]')); return callback(new Error('[[error:user-banned]]'));
} }
if (!results.exists) {
return callback(new Error('[[error:no-user]]'));
}
if (userData.email && parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) { if (userData.email && parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(new Error('[[error:email-not-confirmed]]')); return callback(new Error('[[error:email-not-confirmed]]'));
} }