OSDN Git Service

/sendコマンドが動作しなくなっていた不具合を修正した
authorkonekoneko <jbh03215@gmail.com>
Sun, 7 Oct 2012 12:33:19 +0000 (21:33 +0900)
committerkonekoneko <jbh03215@gmail.com>
Sun, 7 Oct 2012 12:33:19 +0000 (21:33 +0900)
chatServer.js
public/scripts/chatclient.js

index fe52eaf..2fe116a 100644 (file)
@@ -286,8 +286,10 @@ function ParseAuthorization(handshakeData, callback)
                        else if(handshakeData.query.token != session.items.token)\r
                                result = "invaild token";\r
                        if(typeof(session) != "undefined" && result == null)\r
+                       {\r
                                handshakeData.admin = session.items.admin;\r
-                       sessionStore.destroy(sessionID);\r
+                               handshakeData.sessionID = sessionID;\r
+                       }\r
                        callback(result,result == null && !err);\r
                });\r
        } else {\r
@@ -305,6 +307,8 @@ function ParseDisconnect(socket,msg)
        socket.json.emit("send romcount",romcount);\r
        socket.json.broadcast.emit("send romcount",romcount);\r
 \r
+       sessionStore.destroy(socket.handshake.sessionID);\r
+\r
        console.log("disconnected");\r
 }\r
 \r
index 774d68c..8b2d4f8 100644 (file)
@@ -457,12 +457,12 @@ function CommandParserWhenPost()
                var message = sprintf($send_message,document.enter_form.name.value,word[2]);\r
 \r
                if(word[1] == document.chat_form.rno.value)\r
-                       $socket.json.emit("send msg",{name:$system_name,message:message,token:document.chat_form.token.value});\r
+                       $socket.json.emit("send msg",{name:$system_name,message:message});\r
 \r
-               var socket = io.connect(location.hostname + "/" + word[1]);\r
+               var socket = io.connect(location.hostname + "/" + word[1] + "?token="+ encodeURIComponent(document.chat_form.token.value));\r
                socket.on("error",getErrorMessage);\r
                socket.on("connect",function(){\r
-                       socket.json.emit("send msg",{name:$system_name,message:message,token:document.chat_form.token.value});\r
+                       socket.json.emit("send msg",{name:$system_name,message:message});\r
                });\r
 \r
                return null;\r