v1.18.x
barisusakli 11 years ago
parent 6b93095204
commit 7d0eb9afaa

@ -5,14 +5,15 @@ var path = require('path'),
fs = require('fs'), fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
user = require('./../user'), user = require('../user'),
topics = require('./../topics'), topics = require('../topics'),
posts = require('./../posts'), posts = require('../posts'),
categories = require('./../categories'), categories = require('../categories'),
meta = require('./../meta'), meta = require('../meta'),
plugins = require('./../plugins'), plugins = require('../plugins'),
utils = require('./../../public/src/utils'), utils = require('../../public/src/utils'),
pkg = require('./../../package.json'); image = require('../image'),
pkg = require('../../package.json');
function deleteTempFiles(files) { function deleteTempFiles(files) {
@ -63,12 +64,18 @@ function uploadPost(req, res, next) {
function uploadThumb(req, res, next) { function uploadThumb(req, res, next) {
if (!meta.config.allowTopicsThumbnail) { if (!meta.config.allowTopicsThumbnail) {
deleteTempFiles(req.files.files); deleteTempFiles(req.files.files);
return callback(new Error('[[error:topic-thumbnails-are-disabled]]')); return next(new Error('[[error:topic-thumbnails-are-disabled]]'));
} }
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); var size = meta.config.topicThumbSize || 120;
image.resizeImage(file.path, path.extname(file.name), size, size, function(err) {
if (err) {
return next(err);
}
uploadImage(file, next);
});
} else { } else {
next(new Error('[[error:invalid-file]]')); next(new Error('[[error:invalid-file]]'));
} }
@ -77,7 +84,6 @@ function uploadThumb(req, res, next) {
function uploadImage(image, callback) { function uploadImage(image, callback) {
if(plugins.hasListeners('filter:uploadImage')) { if(plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', image, callback); plugins.fireHook('filter:uploadImage', image, callback);
} else { } else {
@ -91,7 +97,6 @@ function uploadImage(image, callback) {
} }
function uploadFile(file, callback) { function uploadFile(file, callback) {
if(plugins.hasListeners('filter:uploadFile')) { if(plugins.hasListeners('filter:uploadFile')) {
plugins.fireHook('filter:uploadFile', file, callback); plugins.fireHook('filter:uploadFile', file, callback);
} else { } else {

Loading…
Cancel
Save