Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2233

Browse Source
This commit is contained in:
barisusakli
2014-10-06 16:16:31 -04:00
parent 348911fd2d
commit 6ca06a8e54
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en_GB/groups.json
View File

@@ -1,4 +1,5 @@
{ {
"groups": "Groups",
"view_group": "View Group", "view_group": "View Group",
"details.title": "Group Details", "details.title": "Group Details",

9
src/controllers/accounts.js
View File

@@ -12,6 +12,7 @@ var fs = require('fs'),
user = require('../user'), user = require('../user'),
posts = require('../posts'), posts = require('../posts'),
topics = require('../topics'), topics = require('../topics'),
groups = require('../groups'),
messaging = require('../messaging'), messaging = require('../messaging'),
postTools = require('../postTools'), postTools = require('../postTools'),
utils = require('../../public/src/utils'), utils = require('../../public/src/utils'),
@@ -70,6 +71,9 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
}, },
profile_links: function(next) { profile_links: function(next) {
plugins.fireHook('filter:user.profileLinks', [], next); plugins.fireHook('filter:user.profileLinks', [], next);
},
groups: function(next) {
groups.getUserGroups([uid], next);
} }
}, function(err, results) { }, function(err, results) {
if(err || !results.userData) { if(err || !results.userData) {
@@ -108,17 +112,18 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
userData.ips = results.ips; userData.ips = results.ips;
} }
userData.websiteName = userData.website.replace('http://', '').replace('https://', '');
userData.banned = parseInt(userData.banned, 10) === 1;
userData.uid = userData.uid; userData.uid = userData.uid;
userData.yourid = callerUID; userData.yourid = callerUID;
userData.theirid = userData.uid; userData.theirid = userData.uid;
userData.isSelf = self; userData.isSelf = self;
userData.showSettings = self || isAdmin; userData.showSettings = self || isAdmin;
userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : [];
userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
userData.profile_links = results.profile_links; userData.profile_links = results.profile_links;
userData.status = !websockets.isUserOnline(userData.uid) ? 'offline' : userData.status; userData.status = !websockets.isUserOnline(userData.uid) ? 'offline' : userData.status;
userData.banned = parseInt(userData.banned, 10) === 1;
userData.websiteName = userData.website.replace('http://', '').replace('https://', '');
userData.followingCount = results.followStats.followingCount; userData.followingCount = results.followStats.followingCount;
userData.followerCount = results.followStats.followerCount; userData.followerCount = results.followStats.followerCount;