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

upload changes, just pass filename to plugin or base64 data

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-09 14:51:18 -05:00
parent daa76e821c
commit 2c18bbddbe
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/posts.js
View File

@@ -397,7 +397,7 @@ var db = require('./database'),
Posts.uploadPostImage = function(image, callback) { Posts.uploadPostImage = function(image, callback) {
if(plugins.hasListeners('filter:uploadImage')) { if(plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', image, callback); plugins.fireHook('filter:uploadImage', {base64: image.data, name: image.name}, callback);
} else { } else {
if (meta.config.allowFileUploads) { if (meta.config.allowFileUploads) {
@@ -411,7 +411,7 @@ var db = require('./database'),
Posts.uploadPostFile = function(file, callback) { Posts.uploadPostFile = function(file, callback) {
if(plugins.hasListeners('filter:uploadFile')) { if(plugins.hasListeners('filter:uploadFile')) {
plugins.fireHook('filter:uploadFile', file, callback); plugins.fireHook('filter:uploadFile', {base64: file.data, name: file.name}, callback);
} else { } else {
if(!meta.config.allowFileUploads) { if(!meta.config.allowFileUploads) {

8
src/routes/admin.js
View File

@@ -195,13 +195,7 @@ var nconf = require('nconf'),
} }
if(plugins.hasListeners('filter:uploadImage')) { if(plugins.hasListeners('filter:uploadImage')) {
image.convertImageToBase64(req.files.userPhoto.path, function(err, image64) { plugins.fireHook('filter:uploadImage', {file: req.files.userPhoto.path, name:filename}, done);
if(err) {
return done(err);
}
plugins.fireHook('filter:uploadImage', {data:image64, name:filename}, done);
});
} else { } else {
saveFileToLocal(filename, req, done); saveFileToLocal(filename, req, done);
} }

4
src/routes/user.js
View File

@@ -172,9 +172,7 @@ var fs = require('fs'),
} }
if(plugins.hasListeners('filter:uploadImage')) { if(plugins.hasListeners('filter:uploadImage')) {
image.convertImageToBase64(req.files.userPhoto.path, function(err, image64) { plugins.fireHook('filter:uploadImage', {file: req.files.userPhoto.path, name: filename}, done);
plugins.fireHook('filter:uploadImage', {data:image64, name:filename}, done);
});
} else { } else {
user.getUserField(req.user.uid, 'uploadedpicture', function (err, oldpicture) { user.getUserField(req.user.uid, 'uploadedpicture', function (err, oldpicture) {