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

Resolve merge conflicts

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-02-18 19:14:39 -07:00
parent b227297ef3 1b43faba1a
commit 23540afaeb
7 changed files with 193 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/controllers/uploads.js
View File

@@ -6,7 +6,6 @@ var async = require('async');
var nconf = require('nconf');
var validator = require('validator');
var winston = require('winston');
var mime = require('mime');
var meta = require('../meta');
var file = require('../file');
@@ -59,7 +58,10 @@ function uploadAsImage(req, uploadedFile, callback) {
return next(new Error('[[error:no-privileges]]'));
}
if (plugins.hasListeners('filter:uploadImage')) {
return plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: req.uid }, callback);
return plugins.fireHook('filter:uploadImage', {
image: uploadedFile,
uid: req.uid,
}, callback);
}
file.isFileTypeAllowed(uploadedFile.path, next);
},
@@ -155,7 +157,10 @@ uploadsController.uploadThumb = function (req, res, next) {
}
if (plugins.hasListeners('filter:uploadImage')) {
return plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: req.uid }, next);
return plugins.fireHook('filter:uploadImage', {
image: uploadedFile,
uid: req.uid,
}, next);
}
uploadFile(req.uid, uploadedFile, next);
@@ -166,11 +171,17 @@ uploadsController.uploadThumb = function (req, res, next) {
uploadsController.uploadGroupCover = function (uid, uploadedFile, callback) {
if (plugins.hasListeners('filter:uploadImage')) {
return plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: uid }, callback);
return plugins.fireHook('filter:uploadImage', {
image: uploadedFile,
uid: uid,
}, callback);
}
if (plugins.hasListeners('filter:uploadFile')) {
return plugins.fireHook('filter:uploadFile', { file: uploadedFile, uid: uid }, callback);
return plugins.fireHook('filter:uploadFile', {
file: uploadedFile,
uid: uid,
}, callback);
}
file.isFileTypeAllowed(uploadedFile.path, function (err) {
@@ -183,7 +194,10 @@ uploadsController.uploadGroupCover = function (uid, uploadedFile, callback) {
function uploadFile(uid, uploadedFile, callback) {
if (plugins.hasListeners('filter:uploadFile')) {
return plugins.fireHook('filter:uploadFile', { file: uploadedFile, uid: uid }, callback);
return plugins.fireHook('filter:uploadFile', {
file: uploadedFile,
uid: uid,
}, callback);
}
if (!uploadedFile) {
@@ -196,7 +210,7 @@ function uploadFile(uid, uploadedFile, callback) {
if (meta.config.hasOwnProperty('allowedFileExtensions')) {
var allowed = file.allowedExtensions();
var extension = typeToExtension(uploadedFile.type);
var extension = file.typeToExtension(uploadedFile.type);
if (!extension || (allowed.length > 0 && allowed.indexOf(extension) === -1)) {
return callback(new Error('[[error:invalid-file-type, ' + allowed.join(', ') + ']]'));
}
@@ -206,7 +220,7 @@ function uploadFile(uid, uploadedFile, callback) {
}
function saveFileToLocal(uploadedFile, callback) {
var extension = typeToExtension(uploadedFile.type);
var extension = file.typeToExtension(uploadedFile.type);
if (!extension) {
return callback(new Error('[[error:invalid-extension]]'));
}
@@ -227,14 +241,6 @@ function saveFileToLocal(uploadedFile, callback) {
});
}
function typeToExtension(type) {
var extension;
if (type) {
extension = '.' + mime.extension(type);
}
return extension;
}
function deleteTempFiles(files) {
async.each(files, function (file, next) {
fs.unlink(file.path, function (err) {
@@ -246,5 +252,4 @@ function deleteTempFiles(files) {
});
}
module.exports = uploadsController;