typeで指定できるパラメーターを追加した

[webchat/WebChat.git] / profile.js

diff --git a/profile.js b/profile.js
index bac3320..76b3018 100644 (file)
--- a/profile.js
+++ b/profile.js
@@ -128,7 +128,7 @@ function detail_proc(req, res)
                        RenderMessage(res,resource.notfound_name,req.session.items);\r
                else{\r
                        res.setHeader("X-FRAME-OPTIONS","DENY");\r
-                       res.render("profile/detail",{list:result,token:req.session._csrf,admin:req.session.items.admin});\r
+                       res.render("profile/detail",{list:result,alias:config.alias,token:req.session._csrf,admin:req.session.items.admin});\r
                }\r
        });\r
 }\r
@@ -176,7 +176,7 @@ function detail_postproc(req, res)
                                RenderMessage(res,err,req.session.items);\r
                        }else if(result != null){\r
                                res.setHeader("X-FRAME-OPTIONS","DENY");\r
-                               res.render("profile/edit",{list:result,token:req.session._csrf});\r
+                               res.render("profile/edit",{list:result,token:req.session._csrf,alias:config.alias});\r
                        }else{\r
                                RenderMessage(res,resource.unmatch_password,req.session.items);\r
                        }\r
@@ -195,7 +195,7 @@ function edit_postproc(req, res)
        }else if(typeof(req.body.edit) != "undefined"){\r
                async.waterfall([\r
                        function(cb){\r
-                               if(req.body.updatepw == false)\r
+                               if(req.body.updatepassword == false)\r
                                        collection.UpdatAsync(req.body.name,req.body,null,cb);\r
                                else\r
                                        collection.UpdatAsync(req.body.name,req.body,req.body.password,cb);\r
@@ -235,7 +235,7 @@ function registor_proc(req, res)
                req.session.items = new security.SessionInfomation(false);\r
 \r
        res.setHeader("X-FRAME-OPTIONS","DENY");\r
-       res.render("profile/registor",{token:req.session._csrf});\r
+       res.render("profile/registor",{token:req.session._csrf,alias:config.alias});\r
 }\r
 \r
 function RenderMessage(res,msg,info)\r
@@ -277,32 +277,11 @@ function ProfileCollection()
                pool.query("SELECT * FROM list WHERE name_hash = ? and name = ?",[murmurhash.v3(name),name],cb);\r
        }\r
        this.AddAsync = function(data,cb){\r
-               var item = {\r
-                       name_hash:murmurhash.v3(data.name),\r
-                       name:data.name,\r
-                       age:data.age,\r
-                       gender:data.gender,\r
-                       height:data.height,\r
-                       weight:data.weight,\r
-                       race:data.race,\r
-                       password:md5_hex(data.password),\r
-                       lastmodified:new Date(),\r
-                       etc:data.etc\r
-               };\r
+               var item = GetItem(data);\r
                pool.query("INSERT INTO list SET ?",[item],cb);\r
        }\r
        this.UpdatAsync = function(name,data,newpassword,cb){\r
-               var item = {\r
-                       name_hash:murmurhash.v3(data.name),\r
-                       name:data.name,\r
-                       age:data.age,\r
-                       gender:data.gender,\r
-                       height:data.height,\r
-                       weight:data.weight,\r
-                       race:data.race,\r
-                       lastmodified:new Date(),\r
-                       etc:data.etc\r
-               };\r
+               var item = GetItem(data);\r
                if(newpassword != null)\r
                        item.password = md5_hex(newpassword);\r
                pool.query("UPDATE list SET ? WHERE name = ?",[item,name],cb);\r
@@ -330,5 +309,18 @@ function ProfileCollection()
                md5.update(src, 'utf8');\r
        return md5.digest('hex');\r
        }\r
+\r
+       function GetItem(data)\r
+       {\r
+               var item = {\r
+                       name_hash:murmurhash.v3(data.name),\r
+                       name:data.name,\r
+                       password:md5_hex(data.password),\r
+                       lastmodified:new Date(),\r
+               };\r
+               for(var key in config.alias)\r
+                       item[key] = data[key];\r
+               return item;\r
+       }\r
 }\r
 \r