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

closes #5484

Browse Source
This commit is contained in:
barisusakli
2017-04-14 12:59:36 -04:00
parent b8c606cbbd
commit e63559b6fd
5 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/controllers/uploads.js
View File

@@ -33,7 +33,7 @@ uploadsController.upload = function (req, res, filesIterator) {
return res.status(500).json({ path: req.path, error: err.message });
}
res.status(200).send(images);
res.status(200).json(images);
});
};
@@ -208,20 +208,18 @@ uploadsController.uploadFile = function (uid, uploadedFile, callback) {
return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]'));
}
if (meta.config.hasOwnProperty('allowedFileExtensions')) {
var allowed = file.allowedExtensions();
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(', ') + ']]'));
}
var allowed = file.allowedExtensions();
var extension = path.extname(uploadedFile.name);
if (!extension || extension === '.' || (allowed.length > 0 && allowed.indexOf(extension) === -1)) {
return callback(new Error('[[error:invalid-file-type, ' + allowed.join(', ') + ']]'));
}
saveFileToLocal(uploadedFile, callback);
};
function saveFileToLocal(uploadedFile, callback) {
var extension = file.typeToExtension(uploadedFile.type);
if (!extension) {
var extension = path.extname(uploadedFile.name);
if (!extension || extension === '.') {
return callback(new Error('[[error:invalid-extension]]'));
}
var filename = uploadedFile.name || 'upload';