From 626423e01bf790bc470ddb9d79c6071cbea61333 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 19 Jun 2013 10:32:48 -0400
Subject: [PATCH] path join on user routers

---
 src/routes/user.js | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/routes/user.js b/src/routes/user.js
index 5cf6981714..b050fd2355 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -113,9 +113,8 @@ var user = require('./../user.js'),
 					return;
 				}
 
-				var filename = path.basename(oldpicture);
-				var absolutePath = global.configuration['ROOT_DIRECTORY'] + config.upload_path + filename;
-
+				var absolutePath = path.join(global.configuration['ROOT_DIRECTORY'], config.upload_path, path.basename(oldpicture));
+				
 				fs.unlink(absolutePath, function(err) {
 					if(err) {				
 						console.log(err);
@@ -124,18 +123,16 @@ var user = require('./../user.js'),
 					uploadUserPicture(req.user.uid, req.files.userPhoto.name, req.files.userPhoto.path, res);
 					
 				});
-				
 			});
-
 		});
 		
 		function uploadUserPicture(uid, filename, tempPath, res) {
 
 			if(!filename){
 				res.send({
-	                error: 'Error uploading file! Error : Invalid file name!'
+					error: 'Error uploading file! Error : Invalid file name!'
 				});
-	            return;
+				return;
 			}
 			
 			filename = uid + '-' + filename;
@@ -147,26 +144,28 @@ var user = require('./../user.js'),
 			var os = fs.createWriteStream(global.configuration['ROOT_DIRECTORY'] + uploadPath);
 
 			is.on('end', function() {
- 				fs.unlinkSync(tempPath);
+				fs.unlinkSync(tempPath);
 
 				var imageUrl = config.upload_url + filename;
-		 			
-		        res.send({
+
+				res.send({
 					path: imageUrl
-		        });
-		            
-		        user.setUserField(uid, 'uploadedpicture', imageUrl);
-		        user.setUserField(uid, 'picture', imageUrl);
+				});
+
+				user.setUserField(uid, 'uploadedpicture', imageUrl);
+				user.setUserField(uid, 'picture', imageUrl);
 
-		        var im = require('node-imagemagick');
+				var im = require('node-imagemagick');
 
-		        im.resize({
-				  srcPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
-				  dstPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
-				  width: 128
+				im.resize({
+					srcPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
+					dstPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
+					width: 128
 				}, function(err, stdout, stderr){
-				  if (err) 
-				  	throw err;
+					if (err) {
+						console.log(err);
+						throw err;
+					}
 				});
 
 			});