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

Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc

Browse source
This commit is contained in:
John McLear 2014-11-23 14:14:11 +00:00
commit 0eb7cc7864
39 changed files with 651 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,6 +94,9 @@ exports.handleConnect = function(client)
*/
exports.kickSessionsFromPad = function(padID)
{
if(typeof socketio.sockets['clients'] !== 'function')
return;
//skip if there is nobody on this pad
if(socketio.sockets.clients(padID).length == 0)
return;
@ -496,14 +499,19 @@ function handleSuggestUserName(client, message)
return;
}
var padId = sessioninfos[client.id].padId,
clients = socketio.sockets.clients(padId);
var padId = sessioninfos[client.id].padId;
var roomClients = [], room = socketio.sockets.adapter.rooms[padId];
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
//search the author and send him this message
for(var i = 0; i < clients.length; i++) {
var session = sessioninfos[clients[i].id];
for(var i = 0; i < roomClients.length; i++) {
var session = sessioninfos[roomClients[i].id];
if(session && session.author == message.data.payload.unnamedId) {
clients[i].json.send(message);
roomClients[i].json.send(message);
break;
}
}