ログの形式を変更した

[webchat/WebChat.git] / chat.js

diff --git a/chat.js b/chat.js
index 9ab0aea..4fb80fd 100644 (file)
--- a/chat.js
+++ b/chat.js
@@ -29,8 +29,6 @@ module.exports = function(app,server,express,session){
        app.get("/chat", chat_proc);\r
        app.all("/log/*",express.basicAuth(auth_proc));\r
        app.get("/log/*",log_proc);\r
-       app.all("/admin_chat",express.basicAuth(auth_proc));\r
-       app.get("/admin_chat", adminchat_proc);\r
        app.all("/admin",express.basicAuth(auth_proc));\r
        app.get("/admin", admin_proc);\r
        app.post("/admin",admin_postproc);\r
@@ -69,16 +67,6 @@ function log_proc(req, res) {
        res.sendfile(__dirname + req.url);\r
 }\r
 \r
-function adminchat_proc(req, res){\r
-       var info = new security.SessionInfomation(true);\r
-       req.session.items = info;\r
-\r
-       var room_number = 0;\r
-       if(typeof(req.query.rno) != "undefined")\r
-               room_number = req.query.rno;\r
-       res.render("chat",{rno:room_number,token:info.token});\r
-}\r
-\r
 function admin_postproc(req,res){\r
        if(req.session.items.token != req.body.token)\r
        {\r
@@ -464,7 +452,6 @@ function ParseConnect(socket)
        room.AddRom(ip);\r
 \r
        var roomconfig = room.GetConfig();\r
-       roomconfig.admin = socket.handshake.admin;\r
        socket.json.emit("send roominfo",roomconfig);\r
 \r
        var romcount = room.GetRomCount();\r
@@ -508,10 +495,7 @@ 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
                                handshakeData.sessionID = sessionID;\r
-                       }\r
                        callback(result,result == null && !err);\r
                });\r
        } else {\r
@@ -703,7 +687,7 @@ function ParseGetPastLog(socket,file)
                return;\r
        var path = $log_directory + "/" + file;\r
        var log = new ChatLog(path);\r
-       log.ToArray(socket.handshake.admin,function(array){\r
+       log.ToArray(config.showip,function(array){\r
                socket.json.emit("req pastlog",array);\r
        });\r
 }\r
@@ -718,7 +702,7 @@ function ChatLog(path)
                        var array = new Array();\r
                        var stream = fs.createReadStream(path);\r
                        new lazy(stream)\r
-                               .spilt(";")\r
+                               .lines\r
                                .forEach(function(line){\r
                                        var msg = CreateMessageFromText(line.toString());\r
                                        if(hasIp == false)\r
@@ -745,7 +729,7 @@ function ChatLog(path)
                                msg.date + "<>" +\r
                                ip + "<>" +\r
                                msg.message +\r
-                               ";";\r
+                               "\n";\r
                return text;\r
        }\r
 \r