From: Luigi Pinca <luigipinca@gmail.com>
Date: Tue, 21 Aug 2012 19:45:34 +0000 (+0200)
Subject: session cookie "nickname" is now encoded/decoded with encode/decodeURIComponent to... 
X-Git-Url: https://git.saalbach.dev/?a=commitdiff_plain;h=c65aac9139712c00fe252a74d94a8229751bef34;p=binbsis50.git

session cookie "nickname" is now encoded/decoded with encode/decodeURIComponent to correctly work with express 3.x
---

diff --git a/package.json b/package.json
index bc131e3..e588c2c 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,17 @@
 {
+  "analyze": false,
+  "bundleDependencies": [
+    "async",
+    "connect-redis",
+    "express",
+    "jade",
+    "nodemailer",
+    "redis",
+    "redis-url",
+    "socket.io"
+  ],
   "dependencies": {
-    "async": "0.1.x",
-    "canvas": "0.13.x",
-    "connect-redis": "1.4.x",
-    "express": "3.0.x",
-    "jade": "0.27.x",
-    "nodemailer": "0.3.x",
-    "redis": "0.7.x",
-    "redis-url": "0.1.x",
-    "socket.io": "0.9.x"
+    "canvas": "0.13.x"
   },
   "engines": {
     "node": "0.8.x"
@@ -18,5 +21,5 @@
     "start": "app.js"
   },
   "subdomain": "binb",
-  "version": "0.3.3"
+  "version": "0.3.3-1"
 }
\ No newline at end of file
diff --git a/public/static/js/room.js b/public/static/js/room.js
index 89a1afc..c006099 100644
--- a/public/static/js/room.js
+++ b/public/static/js/room.js
@@ -64,7 +64,8 @@
     // Prompt for name and send it.
     var joinAnonymously = function(msg) {
         if (/nickname\s*\=/.test(document.cookie) && !msg) {
-            nickname = unescape(document.cookie.replace(/.*nickname\s*\=\s*([^;]*);?.*/, '$1'));
+            var encodednickname = document.cookie.replace(/.*nickname\s*\=\s*([^;]*);?.*/, '$1');
+            nickname = decodeURIComponent(encodednickname);
             socket.emit('joinanonymously', nickname, roomname);
         }
         else {
@@ -131,7 +132,7 @@
     // Successfully joined the room
     var ready = function(usersData, trackscount, loggedin) {
         if (!loggedin && !/nickname\s*\=/.test(document.cookie)) {
-            document.cookie = 'nickname='+escape(nickname)+';path=/;';
+            document.cookie = 'nickname='+encodeURIComponent(nickname)+';path=/;';
         }
         
         DOM.modal.modal('hide').empty();