libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-08 03:02:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #723 from fourplusone/fix/fix-722

Browse source 
fix #722 by better argument checking in PadMessageHandler.js
This commit is contained in:
John McLear 2012-05-22 05:31:48 -07:00
commit 5e5a4446bc
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
node/handler/PadMessageHandler.js
View file

@ -170,27 +170,26 @@ exports.handleMessage = function(client, message)
{ {
handleClientReady(client, message); handleClientReady(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.type == "COLLABROOM" && typeof message.data == 'object'){
message.data.type == "USER_CHANGES") if (message.data.type == "USER_CHANGES")
{ {
handleUserChanges(client, message); handleUserChanges(client, message);
} }
else if(message.type == "COLLABROOM" && else if (message.data.type == "USERINFO_UPDATE")
message.data.type == "USERINFO_UPDATE")
{ {
handleUserInfoUpdate(client, message); handleUserInfoUpdate(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.data.type == "CHAT_MESSAGE")
message.data.type == "CHAT_MESSAGE")
{ {
handleChatMessage(client, message); handleChatMessage(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.data.type == "CLIENT_MESSAGE" &&
message.data.type == "CLIENT_MESSAGE" && typeof message.data.payload == 'object' &&
message.data.payload.type == "suggestUserName") message.data.payload.type == "suggestUserName")
{ {
handleSuggestUserName(client, message); handleSuggestUserName(client, message);
} }
}
//if the message type is unknown, throw an exception //if the message type is unknown, throw an exception
else else
{ {