From 2358528880b801e161e2a6b831522302abccf536 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Sun, 28 Apr 2013 21:11:39 -0400
Subject: [PATCH] merging changes for stash pop

---
 src/user.js      |  4 +---
 src/webserver.js | 16 +++++-----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/user.js b/src/user.js
index 7b03bc4767..5b5591c78b 100644
--- a/src/user.js
+++ b/src/user.js
@@ -31,9 +31,7 @@ var	config = require('../config.js'),
 						}
 					});
 
-					global.uid = uid;
-
-					return global.socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
+					return socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
 				}
 			});
 		});
diff --git a/src/webserver.js b/src/webserver.js
index c89dcc036b..fa11d14e09 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -46,17 +46,11 @@ var express = require('express'),
 				global.modules.user.get_uid_by_session(req.sessionID, function(uid) {
 					if (uid !== null) {
 						req.session.uid = uid;
-
-						/*global.socket.emit('event:alert', {
-							title: 'Welcome ' + user.username,
-							message: 'You have successfully logged in.',
-							type: 'notify',
-							timeout: 2000
-						});*/
-					} else req.session.uid = 0;
-
-					if (req.session.uid) console.log('info: [Auth] uid ' + req.session.uid + ' found. Welcome back.');
-					else console.log('info: [Auth] No login session found.');
+						console.log('info: [Auth] uid ' + req.session.uid + ' found. Welcome back.');
+					} else {
+						req.session.uid = 0;
+						console.log('info: [Auth] No login session found.');
+					}
 				});
 			} else {
 				// console.log('SESSION: ' + req.sessionID);