r9919 - in apps/gobi/trunk/code: Page User

Author: hannes
Date: 2009-09-17 16:14:34 +0200 (Thu, 17 Sep 2009)
New Revision: 9919

Modified:
   apps/gobi/trunk/code/Page/PageActions.js
   apps/gobi/trunk/code/User/User.js
Log:
Rename password reset token and timestamp

Details at http://dev.helma.org/trac/helma/changeset/9919

Modified: apps/gobi/trunk/code/Page/PageActions.js
===================================================================
--- apps/gobi/trunk/code/Page/PageActions.js	2009-09-17 14:08:46 UTC (rev 9918)
+++ apps/gobi/trunk/code/Page/PageActions.js	2009-09-17 14:14:34 UTC (rev 9919)
@@ -655,8 +655,8 @@
                 var rnd = java.security.SecureRandom.getInstance("SHA1PRNG");
                 var token = Math.abs(rnd.nextLong()).toString(36) + Math.abs(rnd.nextLong()).toString(36);
                 var data = user.getFormData();
-                data.reset_password_token = token;
-                data.reset_password_time = Date.now();
+                data.password_reset_token = token;
+                data.password_reset_time = Date.now();
                 user.setFormData(data);
                 var mail = new helma.Mail();
                 mail.setFrom("[email protected]"); // FIXME

Modified: apps/gobi/trunk/code/User/User.js
===================================================================
--- apps/gobi/trunk/code/User/User.js	2009-09-17 14:08:46 UTC (rev 9918)
+++ apps/gobi/trunk/code/User/User.js	2009-09-17 14:14:34 UTC (rev 9919)
@@ -79,9 +79,9 @@
 
 function reset_action() {
     var formdata = this.getFormData(),
-        token = formdata && formdata.reset_password_token;
+        token = formdata && formdata.password_reset_token;
     if (token && token === req.data.token) {
-        var time = formdata.reset_password_time;
+        var time = formdata.password_reset_time;
         if (isNaN(time)) {
             res.data.body = "Invalid password reset timestamp. " +
                     "Please request a new token.";