fixed a URL encoding issue

diff --git a/package.json b/package.json
index 5f286881b53fba15b61a805afe15dad4fa49376f..8c8328b0b501ee173810ea8bb4c5552aa22cedc6 100644 (file)
--- a/package.json
+++ b/package.json
@@ -17,5 +17,5 @@
   "engines": {
     "node": "0.6.x"
   },
-  "version": "0.3.1"
-}
+  "version": "0.3.1-1"
+}
\ No newline at end of file

diff --git a/public/static/js/room.js b/public/static/js/room.js
index 185bf622034c9a93afeaa994df5a4d7006695ad4..d62326620e742da52a65f8a9b586d83c254d2750 100644 (file)
--- a/public/static/js/room.js
+++ b/public/static/js/room.js
@@ -238,7 +238,7 @@
             var guesstime = $('<span class="guess-time"></span>');
             li.append(pvt, username, points, roundrank, roundpointsel, guesstime);
             if (user.registered) {
-                var href = 'href="/user/'+encodeURI(username.html())+'"';
+                var href = 'href="/user/'+encodeURIComponent(user.nickname)+'"';
                 pvt.after('<a class="registered" target="_blank" '+href+'></a>');
             }
             DOM.users.append(li);

diff --git a/routes/site.js b/routes/site.js
index 5e09ea13ab48c50e833ded07319ba71529b829c6..0dce1020ad73e3e98593ba0e7ebbd3e4bdc44c93 100644 (file)
--- a/routes/site.js
+++ b/routes/site.js
@@ -30,7 +30,7 @@ exports.use = function(options) {
 
 exports.index = function(req, res) {
     if (req.session.user) {
-        res.local('loggedin', req.session.user.replace(/&/g, "&"));
+        res.local('loggedin', req.session.user);
     }
     res.render("index", {rooms:rooms});
 };
@@ -68,7 +68,7 @@ exports.artworks = function(req, res) {
 exports.room = function(req, res) {
     if (rooms.indexOf(req.params.room) !== -1) {
         if (req.session.user) {
-            res.local('loggedin', req.session.user.replace(/&/g, "&"));
+            res.local('loggedin', req.session.user);
         }
         res.render("room", {roomname:req.params.room,rooms:rooms});
     }

diff --git a/routes/user.js b/routes/user.js
index 77178b8d871b71ac74d87b0d7294afac55f3b381..b7237bb77b9548cfafba73353a403d9b7831a2e8 100644 (file)
--- a/routes/user.js
+++ b/routes/user.js
@@ -192,7 +192,6 @@ exports.profile = function(req, res) {
     db.exists(key, function(err, data) {
         if (data === 1) {
             db.hgetall(key, function(e, obj) {
-                obj.username = obj.username.replace(/&/g, '&');
                 obj.bestguesstime = (obj.bestguesstime/1000).toFixed(1);
                 obj.worstguesstime = (obj.worstguesstime/1000).toFixed(1);
                 if (obj.guessed !== '0') {

diff --git a/views/index.jade b/views/index.jade
index 1a214b6de77f569f0f03357656b13538c94a5d0a..2ad25d3ae5f6616a8853f5aaf8d20c9f4c0bdede 100644 (file)
--- a/views/index.jade
+++ b/views/index.jade
@@ -18,7 +18,8 @@ html
                         if (typeof(loggedin) !== "undefined")
                             li
                                 p.navbar-text Logged in as 
-                                    a#loggedin(href="/user/#{loggedin}",target="_blank") #{loggedin}
+                                    a#loggedin(href="/user/#{encodeURIComponent(loggedin)}",
+                                        target="_blank") #{loggedin.replace(/&/g, '&')}
                             li
                                 a(href="/logout") Logout
                         else

diff --git a/views/room.jade b/views/room.jade
index 0d8af23fef5af2d614ef8a3b8e28e13c997eed10..75a46ad1f936bc16b1ca7d9a4cd11894155291f0 100644 (file)
--- a/views/room.jade
+++ b/views/room.jade
@@ -27,7 +27,8 @@ html
                         if (typeof(loggedin) !== "undefined")
                             li
                                 p.navbar-text Logged in as 
-                                    a#loggedin(href="/user/#{loggedin}",target="_blank") #{loggedin}
+                                    a#loggedin(href="/user/#{encodeURIComponent(loggedin)}",
+                                        target="_blank") #{loggedin.replace(/&/g, '&')}
                             li
                                 a(href="/logout") Logout
                         else

diff --git a/views/user.jade b/views/user.jade
index c4c91a54f22d3ea9292ec043c1d1b6884bdb9246..208d0ae4bc1d39c3060b5954bac5f9cb23708072 100644 (file)
--- a/views/user.jade
+++ b/views/user.jade
@@ -1,7 +1,7 @@
 doctype html
 html
     include header
-        title binb :: #{username} info
+        title binb :: #{username.replace(/&/g, '&')} info
     body
         include uv.jade
         .navbar.navbar-fixed-top
@@ -13,7 +13,7 @@ html
             section
                 .row
                     .span7.offset1
-                        .profile #{username}
+                        .profile #{username.replace(/&/g, '&')}
                             .img
                         div member since #{joindate}
             section