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

closes #4295

Browse Source
This commit is contained in:
barisusakli
2016-03-02 16:04:16 +02:00
parent 7c2041e8d8
commit cf00371892
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/uploads.js
View File

@@ -46,15 +46,9 @@ uploadsController.upload = function(req, res, filesIterator, next) {
uploadsController.uploadPost = function(req, res, next) { uploadsController.uploadPost = function(req, res, next) {
uploadsController.upload(req, res, function(uploadedFile, next) { uploadsController.upload(req, res, function(uploadedFile, next) {
if (uploadedFile.type.match(/image./)) { if (uploadedFile.type.match(/image./)) {
file.isFileTypeAllowed(uploadedFile.path, function(err, tempPath) { uploadImage(req.uid, uploadedFile, next);
if (err) {
return next(err);
}
uploadImage(req.user ? req.user.uid : 0, uploadedFile, next);
});
} else { } else {
uploadFile(req.user ? req.user.uid : 0, uploadedFile, next); uploadFile(req.uid, uploadedFile, next);
} }
}, next); }, next);
}; };
@@ -82,7 +76,7 @@ uploadsController.uploadThumb = function(req, res, next) {
if (err) { if (err) {
return next(err); return next(err);
} }
uploadImage(req.user ? req.user.uid : 0, uploadedFile, next); uploadImage(req.uid, uploadedFile, next);
}); });
} else { } else {
next(new Error('[[error:invalid-file]]')); next(new Error('[[error:invalid-file]]'));
@@ -108,11 +102,16 @@ function uploadImage(uid, image, callback) {
return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback); return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback);
} }
file.isFileTypeAllowed(image.path, function(err, tempPath) {
if (err) {
return callback(err);
}
if (parseInt(meta.config.allowFileUploads, 10)) { if (parseInt(meta.config.allowFileUploads, 10)) {
uploadFile(uid, image, callback); uploadFile(uid, image, callback);
} else { } else {
callback(new Error('[[error:uploads-are-disabled]]')); callback(new Error('[[error:uploads-are-disabled]]'));
} }
});
} }
function uploadFile(uid, uploadedFile, callback) { function uploadFile(uid, uploadedFile, callback) {