Fix transactions index bug

2 files changed, 7 insertions, 6 deletions

diff --git a/routes/transactions.js b/routes/transactions.js
index ed45cbf0..28fd2418 100644
--- a/routes/transactions.js
+++ b/routes/transactions.js
@@ -28,7 +28,7 @@
         txid = function() {
           var x;
           x = transactions[i++];
-          if (isNaN(parseInt(x))) {
+          if (x.match(/[a-z]/i)) {
             return x;
           }
           return user + ":transactions:" + x;
@@ -47,8 +47,7 @@
       });
     },
     create: function(req, res) {
-      var finish, user;
-      user = req.params.user;
+      var finish;
       finish = function() {
         res.write(JSON.stringify(req.body));
         return res.end();
@@ -57,12 +56,11 @@
       return db.exists(req.body.txid, function(err, result) {
         var multi;
         if (result) {
-          finish();
-          return;
+          return finish();
         }
         multi = db.multi();
         multi.hmset(req.body.txid, req.body);
-        multi.rpush("" + user + ":transactions", req.body.txid);
+        multi.rpush("" + req.params.user + ":transactions", req.body.txid);
         return multi.exec(function(err, replies) {
           return finish();
         });
diff --git a/routes/users.js b/routes/users.js
index df89eb5b..37ce9774 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -177,6 +177,9 @@
         if (req.body.password === '') {
           delete req.body.password;
         }
+        if (req.body.privkey === '') {
+          delete req.body.privkey;
+        }
         db.hmset("user:" + req.params.user, req.body, function() {
           if (req.body.password != null) {
             return bcrypt.hash(req.body.password, 12, function(err, hash) {