Merge remote-tracking branch 'origin/master' into private-groups

src/controllers/accounts.js

@@ -144,6 +144,10 @@ accountsController.getAccount = function(req, res, next) {
 			return helpers.notFound(req, res);
 		}
 
+		if (callerUID !== parseInt(userData.uid, 10)) {
+			user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
+		}
+
 		async.parallel({
 			isFollowing: function(next) {
 				user.isFollowing(callerUID, userData.theirid, next);
@@ -386,25 +390,27 @@ accountsController.accountSettings = function(req, res, next) {
 };
 
 accountsController.uploadPicture = function (req, res, next) {
+	var userPhoto = req.files.files[0];
 	var uploadSize = parseInt(meta.config.maximumProfileImageSize, 10) || 256;
-	if (req.files.userPhoto.size > uploadSize * 1024) {
-		fs.unlink(req.files.userPhoto.path);
+
+	if (userPhoto.size > uploadSize * 1024) {
+		fs.unlink(userPhoto.path);
 		return res.json({
 			error: 'Images must be smaller than ' + uploadSize + ' kb!'
 		});
 	}
 
 	var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
-	if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
-		fs.unlink(req.files.userPhoto.path);
+	if (allowedTypes.indexOf(userPhoto.type) === -1) {
+		fs.unlink(userPhoto.path);
 		return res.json({
 			error: 'Allowed image types are png, jpg and gif!'
 		});
 	}
 
-	var extension = path.extname(req.files.userPhoto.name);
+	var extension = path.extname(userPhoto.name);
 	if (!extension) {
-		fs.unlink(req.files.userPhoto.path);
+		fs.unlink(userPhoto.path);
 		return res.json({
 			error: 'Error uploading file! Error : Invalid extension!'
 		});
@@ -415,11 +421,11 @@ accountsController.uploadPicture = function (req, res, next) {
 
 	async.waterfall([
 		function(next) {
-			image.resizeImage(req.files.userPhoto.path, extension, imageDimension, imageDimension, next);
+			image.resizeImage(userPhoto.path, extension, imageDimension, imageDimension, next);
 		},
 		function(next) {
 			if (parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1) {
-				image.convertImageToPng(req.files.userPhoto.path, extension, next);
+				image.convertImageToPng(userPhoto.path, extension, next);
 			} else {
 				next();
 			}
@@ -447,25 +453,23 @@ accountsController.uploadPicture = function (req, res, next) {
 	], function(err, result) {
 
 		function done(err, image) {
-			fs.unlink(req.files.userPhoto.path);
-			if(err) {
+			fs.unlink(userPhoto.path);
+			if (err) {
 				return res.json({error: err.message});
 			}
 
 			user.setUserFields(updateUid, {uploadedpicture: image.url, picture: image.url});
 
-			res.json({
-				path: image.url
-			});
+			res.json([{name: userPhoto.name, url: image.url}]);
 		}
 
 		if (err) {
-			fs.unlink(req.files.userPhoto.path);
+			fs.unlink(userPhoto.path);
 			return res.json({error:err.message});
 		}
 
 		if (plugins.hasListeners('filter:uploadImage')) {
-			return plugins.fireHook('filter:uploadImage', {image: req.files.userPhoto, uid: updateUid}, done);
+			return plugins.fireHook('filter:uploadImage', {image: userPhoto, uid: updateUid}, done);
 		}
 
 		var convertToPNG = parseInt(meta.config['profile:convertProfileImageToPNG'], 10) === 1;
@@ -473,7 +477,7 @@ accountsController.uploadPicture = function (req, res, next) {
 
 		user.getUserField(updateUid, 'uploadedpicture', function (err, oldpicture) {
 			if (!oldpicture) {
-				file.saveFileToLocal(filename, 'profile', req.files.userPhoto.path, done);
+				file.saveFileToLocal(filename, 'profile', userPhoto.path, done);
 				return;
 			}
 
@@ -484,7 +488,7 @@ accountsController.uploadPicture = function (req, res, next) {
 					winston.err(err);
 				}
 
-				file.saveFileToLocal(filename, 'profile', req.files.userPhoto.path, done);
+				file.saveFileToLocal(filename, 'profile', userPhoto.path, done);
 			});
 		});
 	});

src/controllers/admin/uploads.js

@@ -8,37 +8,8 @@ var fs = require('fs'),
 
 var uploadsController = {};
 
-function validateUpload(res, req, allowedTypes) {
-	if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
-		var err = {
-			error: 'Invalid image type. Allowed types are: ' + allowedTypes.join(', ')
-		};
-
-		fs.unlink(req.files.userPhoto.path);
-		res.send(req.xhr ? err : JSON.stringify(err));
-		return false;
-	}
-
-	return true;
-}
-
-uploadsController.uploadImage = function(filename, folder, req, res) {
-	function done(err, image) {
-		fs.unlink(req.files.userPhoto.path);
-
-		var response = err ? {error: err.message} : {path: image.url};
-
-		res.send(req.xhr ? response : JSON.stringify(response));
-	}
-
-	if (plugins.hasListeners('filter:uploadImage')) {
-		plugins.fireHook('filter:uploadImage', {image: req.files.userPhoto, uid: req.user.uid}, done);
-	} else {
-		file.saveFileToLocal(filename, folder, req.files.userPhoto.path, done);
-	}
-};
-
 uploadsController.uploadCategoryPicture = function(req, res, next) {
+	var uploadedFile = req.files.files[0];
 	var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/svg+xml'],
 		params = null;
 
@@ -48,24 +19,25 @@ uploadsController.uploadCategoryPicture = function(req, res, next) {
 		var err = {
 			error: 'Error uploading file! Error :' + e.message
 		};
-		fs.unlink(req.files.userPhoto.path);
+		fs.unlink(uploadedFile.path);
 		return res.send(req.xhr ? err : JSON.stringify(err));
 	}
 
-	if (validateUpload(res, req, allowedTypes)) {
-		var filename =  'category-' + params.cid + path.extname(req.files.userPhoto.name);
-		uploadsController.uploadImage(filename, 'category', req, res);
+	if (validateUpload(req, res, uploadedFile, allowedTypes)) {
+		var filename =  'category-' + params.cid + path.extname(uploadedFile.name);
+		uploadImage(filename, 'category', uploadedFile, req, res);
 	}
 };
 
 uploadsController.uploadFavicon = function(req, res, next) {
+	var uploadedFile = req.files.files[0];
 	var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon'];
 
-	if (validateUpload(res, req, allowedTypes)) {
-		file.saveFileToLocal('favicon.ico', 'files', req.files.userPhoto.path, function(err, image) {
-			fs.unlink(req.files.userPhoto.path);
+	if (validateUpload(res, req, uploadedFile, allowedTypes)) {
+		file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) {
+			fs.unlink(uploadedFile.path);
 
-			var response = err ? {error: err.message} : {path: image.url};
+			var response = err ? {error: err.message} : [{name: uploadedFile.name, url: image.url}];
 
 			res.send(req.xhr ? response : JSON.stringify(response));
 		});
@@ -81,11 +53,41 @@ uploadsController.uploadGravatarDefault = function(req, res, next) {
 };
 
 function upload(name, req, res, next) {
+	var uploadedFile = req.files.files[0];
 	var allowedTypes = ['image/png', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/gif'];
+	if (validateUpload(req, res, uploadedFile, allowedTypes)) {
+		var filename = name + path.extname(uploadedFile.name);
+		uploadImage(filename, 'files', uploadedFile, req, res);
+	}
+}
 
-	if (validateUpload(res, req, allowedTypes)) {
-		var filename = name + path.extname(req.files.userPhoto.name);
-		uploadsController.uploadImage(filename, 'files', req, res);
+function validateUpload(req, res, uploadedFile, allowedTypes) {
+	if (allowedTypes.indexOf(uploadedFile.type) === -1) {
+		var err = {
+			error: 'Invalid image type. Allowed types are: ' + allowedTypes.join(', ')
+		};
+
+		fs.unlink(uploadedFile.path);
+		res.send(req.xhr ? err : JSON.stringify(err));
+		return false;
+	}
+
+	return true;
+}
+
+function uploadImage(filename, folder, uploadedFile, req, res) {
+	function done(err, image) {
+		fs.unlink(uploadedFile.path);
+
+		var response = err ? {error: err.message} : [{name: uploadedFile.name, url: image.url}];
+
+		res.send(req.xhr ? response : JSON.stringify(response));
+	}
+
+	if (plugins.hasListeners('filter:uploadImage')) {
+		plugins.fireHook('filter:uploadImage', {image: uploadedFile, uid: req.user.uid}, done);
+	} else {
+		file.saveFileToLocal(filename, folder, uploadedFile.path, done);
 	}
 }
 

src/controllers/uploads.js

@@ -0,0 +1,125 @@
+"use strict";
+
+var uploadsController = {},
+
+	fs = require('fs'),
+	path = require('path'),
+	async = require('async'),
+
+	meta = require('../meta'),
+	plugins = require('../plugins'),
+	utils = require('../../public/src/utils'),
+	image = require('../image');
+
+
+uploadsController.upload = function(req, res, filesIterator, next) {
+	var files = req.files.files;
+
+	if (!req.user) {
+		deleteTempFiles(files);
+		return res.status(403).json('not allowed');
+	}
+
+	if (!Array.isArray(files)) {
+		return res.status(500).json('invalid files');
+	}
+
+	if (Array.isArray(files[0])) {
+		files = files[0];
+	}
+
+	async.map(files, filesIterator, function(err, images) {
+		deleteTempFiles(files);
+
+		if (err) {
+			return res.status(500).send(err.message);
+		}
+
+		// IE8 - send it as text/html so browser won't trigger a file download for the json response
+		// malsup.com/jquery/form/#file-upload
+		res.status(200).send(req.xhr ? images : JSON.stringify(images));
+	});
+};
+
+uploadsController.uploadPost = function(req, res, next) {
+	uploadsController.upload(req, res, function(file, next) {
+		if (file.type.match(/image./)) {
+			uploadImage(req.user.uid, file, next);
+		} else {
+			uploadFile(req.user.uid, file, next);
+		}
+	}, next);
+};
+
+uploadsController.uploadThumb = function(req, res, next) {
+	if (parseInt(meta.config.allowTopicsThumbnail, 10) !== 1) {
+		deleteTempFiles(req.files.files);
+		return next(new Error('[[error:topic-thumbnails-are-disabled]]'));
+	}
+
+	uploadsController.upload(req, res, function(file, next) {
+		if(file.type.match(/image./)) {
+			var size = meta.config.topicThumbSize || 120;
+			image.resizeImage(file.path, path.extname(file.name), size, size, function(err) {
+				if (err) {
+					return next(err);
+				}
+				uploadImage(req.user.uid, file, next);
+			});
+		} else {
+			next(new Error('[[error:invalid-file]]'));
+		}
+	}, next);
+};
+
+function uploadImage(uid, image, callback) {
+	if (plugins.hasListeners('filter:uploadImage')) {
+		return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback);
+	}
+
+	if (parseInt(meta.config.allowFileUploads, 10)) {
+		uploadFile(uid, image, callback);
+	} else {
+		callback(new Error('[[error:uploads-are-disabled]]'));
+	}
+}
+
+function uploadFile(uid, file, callback) {
+	if (plugins.hasListeners('filter:uploadFile')) {
+		return plugins.fireHook('filter:uploadFile', {file: file, uid: uid}, callback);
+	}
+
+	if (parseInt(meta.config.allowFileUploads, 10) !== 1) {
+		return callback(new Error('[[error:uploads-are-disabled]]'));
+	}
+
+	if (!file) {
+		return callback(new Error('[[error:invalid-file]]'));
+	}
+
+	if (file.size > parseInt(meta.config.maximumFileSize, 10) * 1024) {
+		return callback(new Error('[[error:file-too-big, ' + meta.config.maximumFileSize + ']]'));
+	}
+
+	var filename = 'upload-' + utils.generateUUID() + path.extname(file.name);
+	require('../file').saveFileToLocal(filename, 'files', file.path, function(err, upload) {
+		if (err) {
+			return callback(err);
+		}
+
+		callback(null, {
+			url: upload.url,
+			name: file.name
+		});
+	});
+}
+
+function deleteTempFiles(files) {
+	for(var i=0; i<files.length; ++i) {
+		fs.unlink(files[i].path);
+	}
+}
+
+
+
+module.exports = uploadsController;