}\r
if(typeof(req.body.updateroom) != "undefined")\r
{\r
- $rooms.Update(req.body.newroomlist,function(){\r
+ $rooms.Update(req.body,function(){\r
res.redirect("/admin");\r
});\r
}\r
log_directory:$log_directory,\r
ipbanlist:iplist,\r
token:req.session._csrf,\r
- roomlist:$rooms.GetString()\r
+ roomlist:$rooms.GetMessage()\r
});\r
});\r
}\r
this.IsContains = function(rno){\r
return rno in collection;\r
};\r
- this.GetString = function(){\r
- var retval = "";\r
+ this.GetMessage = function(){\r
+ var retval = new Array();\r
for(var rno in collection)\r
{\r
- if($rooms.Get(rno).IsVolatile())\r
- continue;\r
- var pass = collection[rno].password;\r
- if(pass == null)\r
- pass = "";\r
- var hiddenlog = collection[rno].hiddenlog;\r
- retval += rno + ":" + pass + ":" + hiddenlog + "\r\n";\r
+ item={};\r
+ item.applyflag = !$rooms.Get(rno).IsVolatile();\r
+ item.password = collection[rno].password;\r
+ if(item.password == null)\r
+ item.password = "";\r
+ item.hiddenlog = collection[rno].hiddenlog;\r
+ retval.push(item);\r
}\r
return retval;\r
};\r
}\r
return retval;\r
}\r
- this.Update = function(text,callfunc){\r
+ this.Update = function(data,callfunc){\r
Clear();\r
async.waterfall([\r
function(next){\r
pool.query("TRUNCATE TABLE rooms",null,next);\r
},\r
function(result,next){\r
- lines = text.split("\r\n");\r
+ console.log(util.inspect(data));\r
var items = new Array();\r
- for(var i = 0; i < lines.length; i++)\r
+ var config = data.config;\r
+ for(var i = 0; i < config.length; i++)\r
{\r
- if(lines[i] == "")\r
+ var rno = Number(config[i].applyflag);\r
+ if(isNaN(rno))\r
continue;\r
- var token = lines[i].split(":");\r
- if(token.length == 1)\r
- {\r
- Add(token[0],null,false);\r
- items.push(new Array(token[0],null,false));\r
- }\r
- else if(token.length == 2)\r
- {\r
- var rno = token[0];\r
- var pass = token[1];\r
- if(pass == "")\r
- pass = null;\r
- Add(rno, pass,false);\r
- items.push(new Array(token[0],pass,false));\r
- }\r
- else if(token.length == 3)\r
- {\r
- var rno = token[0];\r
- var pass = token[1];\r
- if(pass == "")\r
- pass = null;\r
- var hiddenlog = false;\r
- if(token[2] == "true")\r
- hiddenlog = true;\r
- Add(rno, pass,hiddenlog);\r
- items.push(new Array(token[0],pass,hiddenlog));\r
- }\r
+ var password,romonly;\r
+ if(typeof(config[rno].password)=="undefined")\r
+ password = null;\r
+ else if(config[rno].password == "")\r
+ password = null;\r
+ else\r
+ password = config[rno].password;\r
+ if(typeof(config[rno].hiddenlog)=="undefined")\r
+ romonly = false;\r
+ else\r
+ romonly = config[rno].hiddenlog == "romonly";\r
+\r
+ Add(rno,password,romonly);\r
+ items.push(new Array(rno,password,romonly));\r
}\r
pool.query("INSERT INTO rooms VALUES ?",[items],callfunc);\r
}\r