From 40d20846d8961b4892c5282cebe7f2b8e48ccf92 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 31 Dec 2013 03:36:42 -0500
Subject: [PATCH] moar refactor

---
 src/routes/admin.js | 53 +++++++++++++++------------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/src/routes/admin.js b/src/routes/admin.js
index 273c373c51..e2aab456d6 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -120,19 +120,9 @@ var nconf = require('nconf'),
 					return;
 				}
 
-				var tempPath = req.files.userPhoto.path;
-				var extension = path.extname(req.files.userPhoto.name);
+				var filename =  'category-' + params.cid + path.extname(req.files.userPhoto.name);
 
-				if (!extension) {
-					res.send({
-						error: 'Error uploading file! Error : Invalid extension!'
-					});
-					return;
-				}
-
-				var filename =  'category-' + params.cid + extension;
-
-				uploadImage(filename, tempPath, res);
+				uploadImage(filename, req, res);
 			});
 
 			app.post('/uploadfavicon', function(req, res) {
@@ -148,17 +138,7 @@ var nconf = require('nconf'),
 					return;
 				}
 
-				var tempPath = req.files.userPhoto.path;
-				var extension = path.extname(req.files.userPhoto.name);
-
-				if (!extension) {
-					res.send({
-						error: 'Error uploading file! Error : Invalid extension!'
-					});
-					return;
-				}
-
-				uploadImage('favicon.ico', tempPath, res);
+				uploadImage('favicon.ico', req, res);
 			});
 
 			app.post('/uploadlogo', function(req, res) {
@@ -175,23 +155,24 @@ var nconf = require('nconf'),
 					return;
 				}
 
-				var tempPath = req.files.userPhoto.path;
-				var extension = path.extname(req.files.userPhoto.name);
+				var filename =  'site-logo' + path.extname(req.files.userPhoto.name);
 
-				if (!extension) {
-					res.send({
-						error: 'Error uploading file! Error : Invalid extension!'
-					});
-					return;
-				}
-
-				var filename =  'site-logo' + extension;
-
-				uploadImage(filename, tempPath, res);
+				uploadImage(filename, req, res);
 			});
 		});
 
-		function uploadImage(filename, tempPath, res) {
+		function uploadImage(filename, req, res) {
+
+			var tempPath = req.files.userPhoto.path;
+			var extension = path.extname(req.files.userPhoto.name);
+
+			if (!extension) {
+				res.send({
+					error: 'Error uploading file! Error : Invalid extension!'
+				});
+				return;
+			}
+
 			var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), filename);
 
 			winston.info('Attempting upload to: ' + uploadPath);