Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-05-05 18:40:04 -04:00
parent 954392e4c4
commit fee76db8dc
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/templates.js
View File

@@ -49,7 +49,7 @@ var templates = {};
function init() { function init() {
loadTemplates([ loadTemplates([
'header', 'footer', 'register', 'home', 'topic', 'header', 'footer', 'register', 'home', 'topic','account',
'login', 'reset', 'reset_code', 'account', 'login', 'reset', 'reset_code', 'account',
'confirm', 'confirm',
'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext' 'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext'

2
public/templates/footer.tpl
View File

@@ -56,7 +56,7 @@
logoutEl.innerHTML = '<a href="/logout">Log out</a>'; logoutEl.innerHTML = '<a href="/logout">Log out</a>';
name.innerHTML = data['username']; name.innerHTML = data['username'];
gravatar.src = data['picture']; gravatar.src = data['picture']+"?s=24";
user_label.innerHTML = ''; user_label.innerHTML = '';
user_label.appendChild(gravatar); user_label.appendChild(gravatar);

3
src/user.js
View File

@@ -38,7 +38,10 @@ var config = require('../config.js'),
RDB.db.hgetall(String(uid), function(err, data){ RDB.db.hgetall(String(uid), function(err, data){
if(err === null) if(err === null)
{
delete data['password'];
callback(data); callback(data);
}
else else
console.log(err); console.log(err);
}); });

12
src/webserver.js
View File

@@ -286,9 +286,6 @@ passport.deserializeUser(function(uid, done) {
console.log("I GOT "+JSON.stringify(data)); console.log("I GOT "+JSON.stringify(data));
}); });
}); });
app.get('/account', function(req, res) { app.get('/account', function(req, res) {
@@ -310,7 +307,16 @@ passport.deserializeUser(function(uid, done) {
res.send(templates['header'] + account + templates['footer']); res.send(templates['header'] + account + templates['footer']);
}); });
});
app.get('/uid/:uid', function(req, res) {
if(!req.params.uid)
return res.redirect('/403');
user.getUserData(req.params.uid, function(data){
res.send(data);
});
}); });

6
src/websockets.js
View File

@@ -53,11 +53,11 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
modules.templates.init(); modules.templates.init();
} }
process.on('uncaughtException', function(err) { /*process.on('uncaughtException', function(err) {
// handle the error safely // handle the error safely
console.log("error message "+err); console.log("error message "+err);
socket.emit('event:consolelog',{type:'uncaughtException', stack:err.stack, error:err.toString()}); socket.emit('event:consolelog',{type:'uncaughtException', stack:err.stack, error:err.toString()});
}); });*/
socket.emit('event:connect', {status: 1}); socket.emit('event:connect', {status: 1});
@@ -71,6 +71,8 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
socket.on('event:enter_room', function(data) { socket.on('event:enter_room', function(data) {
return;
if (data.leave !== null) socket.leave (data.leave); if (data.leave !== null) socket.leave (data.leave);
socket.join(data.enter); socket.join(data.enter);