From 3f65a69f0ebc84f3d734e0e5e1809e67b3b378b2 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Fri, 13 Sep 2013 10:24:54 -0500
Subject: [PATCH] Fix reset password

---
 changelog            | 7 +++++++
 lib/api.js           | 2 +-
 www/assets/js/acp.js | 2 +-
 www/reset.html       | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 290b07a6..68b89172 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+Fri Sep 13 10:10 2013 CDT
+    * www/reset.html: Fix data.js dependency
+    * lib/api.js: Fix ActionLog trying to record wrong data.  How long has
+      this been broken?
+    * www/assets/js/acp.js: Prepend "/reset.html?" in case admins can't
+      remember what the URL is
+
 Thu Sep 12 18:41 2013 CDT
     * www/index.html: Fix index page not showing public channels
 
diff --git a/lib/api.js b/lib/api.js
index d6847e3d..c3a61360 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -386,7 +386,7 @@ module.exports = function (Server) {
                 });
                 return;
             }
-            ActionLog.record(ip, info[0], "password-recover-success");
+            ActionLog.record(ip, auth.name, "password-recover-success");
             res.jsonp({
                 success: true,
                 name: auth.name,
diff --git a/www/assets/js/acp.js b/www/assets/js/acp.js
index 7938b1c7..3e4de8b4 100644
--- a/www/assets/js/acp.js
+++ b/www/assets/js/acp.js
@@ -407,7 +407,7 @@ function setupCallbacks() {
         if(!data.success)
             alert(data.error);
         else
-            alert("Password reset successful.  Reset hash: " + data.hash);
+            alert("Password reset successful.  Reset hash: /reset.html?" + data.hash);
     });
 
     socket.on("acp-channeldata", function(data) {
diff --git a/www/reset.html b/www/reset.html
index a9f9529f..c48c72e2 100644
--- a/www/reset.html
+++ b/www/reset.html
@@ -60,6 +60,7 @@
     <script src="./assets/js/bootstrap-modal.js"></script>
 
     <!-- Mine -->
+    <script src="./assets/js/data.js"></script>
     <script src="./assets/js/iourl.js"></script>
     <script type="text/javascript">
         var hash = false;