From 1d1625f5c4b4a323b4c1898d14b44a2bdbffa113 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 8 Oct 2014 13:46:36 -0400
Subject: [PATCH] closes #2157

---
 public/uploads/.gitignore        |  1 -
 src/controllers/accounts.js      |  6 +++---
 src/controllers/admin/uploads.js | 10 +++++-----
 src/file.js                      |  4 ++--
 src/routes/api.js                |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 public/uploads/.gitignore

diff --git a/public/uploads/.gitignore b/public/uploads/.gitignore
deleted file mode 100644
index 72e8ffc0db..0000000000
--- a/public/uploads/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index bfcc38db89..4846ae6839 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -25,7 +25,7 @@ var fs = require('fs'),
 
 function userNotFound(res) {
 	res.locals.notFound = true;
-	
+
 	if (res.locals.isAPI) {
 		res.status(404).json('no-user');
 	} else {
@@ -489,7 +489,7 @@ accountsController.uploadPicture = function (req, res, next) {
 
 		user.getUserField(updateUid, 'uploadedpicture', function (err, oldpicture) {
 			if (!oldpicture) {
-				file.saveFileToLocal(filename, req.files.userPhoto.path, done);
+				file.saveFileToLocal(filename, 'profile', req.files.userPhoto.path, done);
 				return;
 			}
 
@@ -500,7 +500,7 @@ accountsController.uploadPicture = function (req, res, next) {
 					winston.err(err);
 				}
 
-				file.saveFileToLocal(filename, req.files.userPhoto.path, done);
+				file.saveFileToLocal(filename, 'profile', req.files.userPhoto.path, done);
 			});
 		});
 	});
diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js
index 081f2c0c04..1c31a00ebc 100644
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@@ -23,7 +23,7 @@ function validateUpload(res, req, allowedTypes) {
 
 
 
-uploadsController.uploadImage = function(filename, req, res) {
+uploadsController.uploadImage = function(filename, folder, req, res) {
 	function done(err, image) {
 		var er, rs;
 		fs.unlink(req.files.userPhoto.path);
@@ -40,7 +40,7 @@ uploadsController.uploadImage = function(filename, req, res) {
 	if(plugins.hasListeners('filter:uploadImage')) {
 		plugins.fireHook('filter:uploadImage', req.files.userPhoto, done);
 	} else {
-		file.saveFileToLocal(filename, req.files.userPhoto.path, done);
+		file.saveFileToLocal(filename, folder, req.files.userPhoto.path, done);
 	}
 };
 
@@ -59,7 +59,7 @@ uploadsController.uploadCategoryPicture = function(req, res, next) {
 
 	if (validateUpload(res, req, allowedTypes)) {
 		var filename =  'category-' + params.cid + path.extname(req.files.userPhoto.name);
-		uploadsController.uploadImage(filename, req, res);
+		uploadsController.uploadImage(filename, 'category', req, res);
 	}
 };
 
@@ -67,7 +67,7 @@ uploadsController.uploadFavicon = function(req, res, next) {
 	var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon'];
 
 	if (validateUpload(res, req, allowedTypes)) {
-		file.saveFileToLocal('favicon.ico', req.files.userPhoto.path, function(err, image) {
+		file.saveFileToLocal('favicon.ico', 'files', req.files.userPhoto.path, function(err, image) {
 			fs.unlink(req.files.userPhoto.path);
 
 			if(err) {
@@ -93,7 +93,7 @@ function upload(name, req, res, next) {
 
 	if (validateUpload(res, req, allowedTypes)) {
 		var filename = name + path.extname(req.files.userPhoto.name);
-		uploadsController.uploadImage(filename, req, res);
+		uploadsController.uploadImage(filename, 'files', req, res);
 	}
 }
 
diff --git a/src/file.js b/src/file.js
index f88728b860..eb0ba7f1b2 100644
--- a/src/file.js
+++ b/src/file.js
@@ -7,9 +7,9 @@ var fs = require('fs'),
 
 var file = {};
 
-file.saveFileToLocal = function(filename, tempPath, callback) {
+file.saveFileToLocal = function(filename, folder, tempPath, callback) {
 
-	var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), filename);
+	var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), folder, filename);
 
 	winston.info('Saving file '+ filename +' to : ' + uploadPath);
 
diff --git a/src/routes/api.js b/src/routes/api.js
index d6fbb258d4..67cddd2aa8 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -115,7 +115,7 @@ function uploadFile(file, callback) {
 		}
 
 		var filename = 'upload-' + utils.generateUUID() + path.extname(file.name);
-		require('../file').saveFileToLocal(filename, file.path, function(err, upload) {
+		require('../file').saveFileToLocal(filename, 'files', file.path, function(err, upload) {
 			if(err) {
 				return callback(err);
 			}