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

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2014-03-18 15:38:06 -04:00
parent 2b8a7c73ac 64676b66c8
commit 98745ae0c4
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/image.js
View File

@@ -19,7 +19,7 @@ image.resizeImage = function(path, extension, width, height, callback) {
.write(path, done); .write(path, done);
} else { } else {
gm(path) gm(path)
.crop(width, height, 0, 0) .resize(width, height)
.write(path, done); .write(path, done);
} }
}; };

1
src/user.js
View File

@@ -5,7 +5,6 @@ var bcrypt = require('bcryptjs'),
nconf = require('nconf'), nconf = require('nconf'),
winston = require('winston'), winston = require('winston'),
gravatar = require('gravatar'), gravatar = require('gravatar'),
validator = require('validator'),
S = require('string'), S = require('string'),
utils = require('./../public/src/utils'), utils = require('./../public/src/utils'),

36
src/user/settings.js
View File

@@ -2,24 +2,12 @@
'use strict'; 'use strict';
var meta = require('./../meta'), var meta = require('./../meta'),
db = require('./../database'); db = require('./../database'),
plugins = require('./../plugins');
module.exports = function(User) { module.exports = function(User) {
User.getSettings = function(uid, callback) { User.getSettings = function(uid, callback) {
function sendDefaultSettings() {
callback(null, {
showemail: false,
usePagination: parseInt(meta.config.usePagination, 10) === 1,
topicsPerPage: parseInt(meta.config.topicsPerPage, 10) || 20,
postsPerPage: parseInt(meta.config.postsPerPage, 10) || 10
});
}
if(!parseInt(uid, 10)) {
return sendDefaultSettings();
}
db.getObject('user:' + uid + ':settings', function(err, settings) { db.getObject('user:' + uid + ':settings', function(err, settings) {
if(err) { if(err) {
return callback(err); return callback(err);
@@ -29,12 +17,20 @@ module.exports = function(User) {
settings = {}; settings = {};
} }
settings.showemail = settings.showemail ? parseInt(settings.showemail, 10) !== 0 : false; plugins.fireHook('filter:user.getSettings', {uid: uid, settings: settings}, function(err, data) {
settings.usePagination = settings.usePagination ? parseInt(settings.usePagination, 10) === 1 : parseInt(meta.config.usePagination, 10) === 1; if(err) {
settings.topicsPerPage = settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20; return callback(err);
settings.postsPerPage = settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10; }
callback(null, settings); settings = data.settings;
settings.showemail = settings.showemail ? parseInt(settings.showemail, 10) !== 0 : false;
settings.usePagination = settings.usePagination ? parseInt(settings.usePagination, 10) === 1 : parseInt(meta.config.usePagination, 10) === 1;
settings.topicsPerPage = settings.topicsPerPage ? parseInt(settings.topicsPerPage, 10) : parseInt(meta.config.topicsPerPage, 10) || 20;
settings.postsPerPage = settings.postsPerPage ? parseInt(settings.postsPerPage, 10) : parseInt(meta.config.postsPerPage, 10) || 10;
callback(null, settings);
});
}); });
}; };
@@ -44,6 +40,8 @@ module.exports = function(User) {
return callback(new Error('Invalid pagination value!')); return callback(new Error('Invalid pagination value!'));
} }
plugins.fireHook('action:user.saveSettings', {uid: uid, settings: data});
db.setObject('user:' + uid + ':settings', { db.setObject('user:' + uid + ':settings', {
showemail: data.showemail, showemail: data.showemail,
usePagination: data.usePagination, usePagination: data.usePagination,