mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 08:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Replace tabs indentation with spaces indentation

Browse source 
Some files are obviously external libraries, I didn't touch them
This commit is contained in:
Luc Didry 2013-12-05 08:41:29 +01:00
parent 03ff5563f4
commit 3d8452b143
35 changed files with 511 additions and 510 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/node/handler/PadMessageHandler.js
View file

@ -455,7 +455,7 @@ function handleGetChatMessages(client, message)
pad.getChatMessages(start, end, function(err, chatMessages)
{
if(ERR(err, callback)) return;
var infoMsg = {
type: "COLLABROOM",
data: {
@ -463,7 +463,7 @@ function handleGetChatMessages(client, message)
messages: chatMessages
}
};
// send the messages back to the client
client.json.send(infoMsg);
});
@ -1564,7 +1564,7 @@ exports.padUsers = function (padID, callback) {
author.id = s.author;
result.push(author);
callback();
callback();
});
}
}, function(err) {

10
src/node/handler/SocketIORouter.js
View file

@ -57,11 +57,11 @@ exports.setSocketIO = function(_socket) {
socket.sockets.on('connection', function(client)
{
if(settings.trustProxy && client.handshake.headers['x-forwarded-for'] !== undefined){
client.set('remoteAddress', client.handshake.headers['x-forwarded-for']);
}
else{
client.set('remoteAddress', client.handshake.address.address);
}
client.set('remoteAddress', client.handshake.headers['x-forwarded-for']);
}
else{
client.set('remoteAddress', client.handshake.address.address);
}
var clientAuthorized = false;
//wrap the original send function to log the messages