GetItem()でパスワード関連の処理を行うようにした

diff --git a/profile.js b/profile.js
index f42a1ee..5c10efc 100644 (file)
--- a/profile.js
+++ b/profile.js
@@ -293,9 +293,7 @@ function ProfileCollection()
                pool.query("INSERT INTO profilelist SET ?",[item],cb);\r
        }\r
        this.UpdatAsync = function(name,data,newpassword,cb){\r
-               var item = GetItem(data);\r
-               if(newpassword != null)\r
-                       item.password = md5_hex(newpassword);\r
+               var item = GetItem(data,newpassword);\r
                pool.query("UPDATE profilelist SET ? WHERE name = ?",[item,name],cb);\r
        }\r
        this.ClearAsync = function(cb){\r
@@ -322,7 +320,7 @@ function ProfileCollection()
        return md5.digest('hex');\r
        }\r
 \r
-       function GetItem(data)\r
+       function GetItem(data,newpw)\r
        {\r
                var item = {\r
                        name_hash:murmurhash.v3(data.name),\r
@@ -330,17 +328,23 @@ function ProfileCollection()
                };\r
                for(var key in config.alias)\r
                {\r
-                       if(key == "password")\r
+                       if(config.alias[key].visible_edit)\r
                        {\r
-                               item[key] = md5_hex(data[key]);\r
-                       }\r
-                       else if(config.alias[key].visible_edit)\r
-                       {\r
-                               console.log("name:"+key+" data:"+data[key]);\r
-                               if(data[key] == "" && typeof(config.alias[key].defaultvalue) != "undefined")\r
+                               if(config.alias[key].type == "password")\r
+                               {\r
+                                       if(typeof(newpw) != "undefined")\r
+                                               data[key] = newpw;\r
+                                       if(data[key] != null)\r
+                                               item[key] = md5_hex(data[key]);\r
+                               }\r
+                               else if(data[key] == "" && typeof(config.alias[key].defaultvalue) != "undefined")\r
+                               {\r
                                        item[key] = config.alias[key].defaultvalue;\r
+                               }\r
                                else\r
+                               {\r
                                        item[key] = data[key];\r
+                               }\r
                        }\r
                }\r
                return item;\r