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

dont display email/fullname if they are private

Browse Source
This commit is contained in:
barisusakli
2014-11-05 23:58:46 -05:00
parent 97633fe01e
commit 719290cd2b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/controllers/accounts.js
View File

@@ -136,11 +136,18 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
accountsController.getUserByUID = function(req, res, next) { accountsController.getUserByUID = function(req, res, next) {
var uid = req.params.uid ? req.params.uid : 0; var uid = req.params.uid ? req.params.uid : 0;
user.getUserData(uid, function(err, userData) { async.parallel({
settings: async.apply(user.getSettings, uid),
userData: async.apply(user.getUserData, uid)
}, function(err, results) {
if (err) { if (err) {
return next(err); return next(err);
} }
res.json(userData);
results.userData.email = results.settings.showemail ? results.userData.email : undefined;
results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
res.json(results.userData);
}); });
}; };

2
src/user.js
View File

@@ -104,7 +104,7 @@ var async = require('async'),
} }
if (user.password) { if (user.password) {
user.password = null; user.password = undefined;
} }
if (!parseInt(user.uid, 10)) { if (!parseInt(user.uid, 10)) {