Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-07 16:12:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5357

Browse Source
This commit is contained in:
barisusakli
2017-01-11 14:40:52 +03:00
parent 37bb6e9b6d
commit 0c8aa599a0
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/socket.io/user/profile.js
View File

@@ -148,7 +148,7 @@ module.exports = function (SocketUser) {
data.email = oldUserData.email;
}
user.updateProfile(data.uid, data, next);
user.updateProfile(socket.uid, data, next);
},
function (userData, next) {
function log(type, eventData) {

22
src/user/profile.js
View File

@@ -16,6 +16,9 @@ module.exports = function (User) {
var fields = ['username', 'email', 'fullname', 'website', 'location',
'groupTitle', 'birthday', 'signature', 'aboutme'];
var updateUid = data.uid;
var oldData;
async.waterfall([
function (next) {
plugins.fireHook('filter:user.updateProfile', {uid: uid, data: data, fields: fields}, next);
@@ -27,14 +30,18 @@ module.exports = function (User) {
async.series([
async.apply(isAboutMeValid, data),
async.apply(isSignatureValid, data),
async.apply(isEmailAvailable, data, uid),
async.apply(isUsernameAvailable, data, uid),
async.apply(isEmailAvailable, data, updateUid),
async.apply(isUsernameAvailable, data, updateUid),
async.apply(isGroupTitleValid, data)
], function (err) {
next(err);
});
},
function (next) {
User.getUserFields(updateUid, fields, next);
},
function (_oldData, next) {
oldData = _oldData;
async.each(fields, function (field, next) {
if (!(data[field] !== undefined && typeof data[field] === 'string')) {
return next();
@@ -43,21 +50,20 @@ module.exports = function (User) {
data[field] = data[field].trim();
if (field === 'email') {
return updateEmail(uid, data.email, next);
return updateEmail(updateUid, data.email, next);
} else if (field === 'username') {
return updateUsername(uid, data.username, next);
return updateUsername(updateUid, data.username, next);
} else if (field === 'fullname') {
return updateFullname(uid, data.fullname, next);
return updateFullname(updateUid, data.fullname, next);
} else if (field === 'signature') {
data[field] = S(data[field]).stripTags().s;
}
User.setUserField(uid, field, data[field], next);
User.setUserField(updateUid, field, data[field], next);
}, next);
},
function (next) {
plugins.fireHook('action:user.updateProfile', {data: data, uid: uid});
User.getUserFields(uid, ['email', 'username', 'userslug', 'picture', 'icon:text', 'icon:bgColor'], next);
User.getUserFields(updateUid, ['email', 'username', 'userslug', 'picture', 'icon:text', 'icon:bgColor'], next);
}
], callback);
};