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

closes #2248

Browse Source
This commit is contained in:
barisusakli
2014-11-05 19:29:45 -05:00
parent 595ff1f4b1
commit 39b679705b
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/accounts.js
View File

@@ -428,7 +428,7 @@ accountsController.uploadPicture = function (req, res, next) {
}); });
} }
var updateUid = req.user.uid; var updateUid = req.user ? req.user.uid : 0;
var imageDimension = parseInt(meta.config.profileImageDimension, 10) || 128; var imageDimension = parseInt(meta.config.profileImageDimension, 10) || 128;
async.waterfall([ async.waterfall([
@@ -482,8 +482,8 @@ accountsController.uploadPicture = function (req, res, next) {
return res.json({error:err.message}); return res.json({error:err.message});
} }
if(plugins.hasListeners('filter:uploadImage')) { if (plugins.hasListeners('filter:uploadImage')) {
return plugins.fireHook('filter:uploadImage', req.files.userPhoto, done); return plugins.fireHook('filter:uploadImage', {image: req.files.userPhoto, uid: updateUid}, done);
} }
var convertToPNG = parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1; var convertToPNG = parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1;

6
src/controllers/admin/uploads.js
View File

@@ -2,8 +2,8 @@
var fs = require('fs'), var fs = require('fs'),
path = require('path'), path = require('path'),
file = require('./../../file'), file = require('../../file'),
plugins = require('./../../plugins'); plugins = require('../../plugins');
var uploadsController = {}; var uploadsController = {};
@@ -37,7 +37,7 @@ uploadsController.uploadImage = function(filename, folder, req, res) {
} }
if (plugins.hasListeners('filter:uploadImage')) { if (plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', req.files.userPhoto, done); plugins.fireHook('filter:uploadImage', {image: req.files.userPhoto, uid: req.user.uid}, done);
} else { } else {
file.saveFileToLocal(filename, folder, req.files.userPhoto.path, done); file.saveFileToLocal(filename, folder, req.files.userPhoto.path, done);
} }

18
src/routes/api.js
View File

@@ -55,7 +55,7 @@ function upload(req, res, filesIterator, next) {
function uploadPost(req, res, next) { function uploadPost(req, res, next) {
upload(req, res, function(file, next) { upload(req, res, function(file, next) {
if(file.type.match(/image./)) { if(file.type.match(/image./)) {
uploadImage(file, next); uploadImage(req.user.uid, file, next);
} else { } else {
uploadFile(file, next); uploadFile(file, next);
} }
@@ -75,7 +75,7 @@ function uploadThumb(req, res, next) {
if (err) { if (err) {
return next(err); return next(err);
} }
uploadImage(file, next); uploadImage(req.user.uid, file, next);
}); });
} else { } else {
next(new Error('[[error:invalid-file]]')); next(new Error('[[error:invalid-file]]'));
@@ -84,22 +84,22 @@ function uploadThumb(req, res, next) {
} }
function uploadImage(image, callback) { function uploadImage(uid, image, callback) {
if(plugins.hasListeners('filter:uploadImage')) { if (plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', image, callback); plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback);
} else { } else {
if (parseInt(meta.config.allowFileUploads, 10)) { if (parseInt(meta.config.allowFileUploads, 10)) {
uploadFile(image, callback); uploadFile(uid, image, callback);
} else { } else {
callback(new Error('[[error:uploads-are-disabled]]')); callback(new Error('[[error:uploads-are-disabled]]'));
} }
} }
} }
function uploadFile(file, callback) { function uploadFile(uid, file, callback) {
if(plugins.hasListeners('filter:uploadFile')) { if (plugins.hasListeners('filter:uploadFile')) {
plugins.fireHook('filter:uploadFile', file, callback); plugins.fireHook('filter:uploadFile', {file: file, uid: uid}, callback);
} else { } else {
if(parseInt(meta.config.allowFileUploads, 10) !== 1) { if(parseInt(meta.config.allowFileUploads, 10) !== 1) {

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

@@ -199,7 +199,7 @@ SocketUser.uploadProfileImageFromUrl = function(socket, url, callback) {
return; return;
} }
plugins.fireHook('filter:uploadImage', {url: url}, function(err, image) { plugins.fireHook('filter:uploadImage', {image: {url: url}, uid: socket.uid}, function(err, image) {
if (err) { if (err) {
return callback(err); return callback(err);
} }