Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-11 21:31:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

merging changes for stash pop

Browse Source
This commit is contained in:
Julian Lam
2013-04-28 21:11:39 -04:00
parent 19a63bf51b
commit 2358528880
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/user.js
View File

@@ -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!'});
}
});
});

16
src/webserver.js
View File

@@ -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);