merging changes for stash pop

src/user.js

@@ -31,9 +31,7 @@ var	config = require('../config.js'),
 						}
 					});
 
-					global.uid = uid;
+					return socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
-
-					return global.socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
 				}
 			});
 		});

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;
-
+						console.log('info: [Auth] uid ' + req.session.uid + ' found. Welcome back.');
-						/*global.socket.emit('event:alert', {
+					} else {
-							title: 'Welcome ' + user.username,
+						req.session.uid = 0;
-							message: 'You have successfully logged in.',
+						console.log('info: [Auth] No login session found.');
-							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.');
 				});
 			} else {
 				// console.log('SESSION: ' + req.sessionID);