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

closes #1978

Browse Source
This commit is contained in:
barisusakli
2014-08-11 16:26:20 -04:00
parent 5e68e0b009
commit c8084e9b2e
2 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/routes/authentication.js
View File

@@ -97,9 +97,6 @@
return res.redirect(nconf.get('relative_path') + '/register' + (err.message ? '?error=' + err.message : ''));
}
delete userData['password-confirm'];
delete userData['_csrf'];
user.create(userData, function(err, uid) {
if (err || !uid) {
return res.redirect(nconf.get('relative_path') + '/register');

58
src/user/create.js
View File

@@ -13,18 +13,37 @@ var async = require('async'),
module.exports = function(User) {
User.create = function(userData, callback) {
userData = userData || {};
var gravatar = User.createGravatarURLFromEmail(userData.email);
var timestamp = Date.now();
var password = userData.password;
userData = {
'username': userData.username.trim(),
'email': userData.email,
'joindate': timestamp,
'picture': gravatar,
'gravatarpicture': gravatar,
'fullname': '',
'location': '',
'birthday': '',
'website': '',
'signature': '',
'uploadedpicture': '',
'profileviews': 0,
'reputation': 0,
'postcount': 0,
'lastposttime': 0,
'banned': 0,
'status': 'online'
};
userData.userslug = utils.slugify(userData.username);
userData.username = userData.username.trim();
if (userData.email !== undefined) {
userData.email = userData.email.trim();
userData.email = validator.escape(userData.email);
}
var password = userData.password;
userData.password = null;
async.parallel({
emailValid: function(next) {
if (userData.email) {
@@ -104,37 +123,14 @@ module.exports = function(User) {
}
db.incrObjectField('global', 'nextUid', function(err, uid) {
if(err) {
if (err) {
return callback(err);
}
var gravatar = User.createGravatarURLFromEmail(userData.email);
var timestamp = Date.now();
userData = utils.merge({
'uid': uid,
'username': userData.username,
'userslug': userData.userslug,
'fullname': '',
'location': '',
'birthday': '',
'website': '',
'email': userData.email || '',
'signature': '',
'joindate': timestamp,
'picture': gravatar,
'gravatarpicture': gravatar,
'uploadedpicture': '',
'profileviews': 0,
'reputation': 0,
'postcount': 0,
'lastposttime': 0,
'banned': 0,
'status': 'online'
}, userData);
userData.uid = uid;
db.setObject('user:' + uid, userData, function(err) {
if(err) {
if (err) {
return callback(err);
}