fix disableCSP

diff --git a/public/trivabble.js b/public/trivabble.js
index 3249d8c983079ae4a25322cc5e1119ce7e890f86..e61fd1d88ae4073eee342d979f81bac55ed67f72 100644 (file)
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -2102,9 +2102,9 @@
         } else {
             myPrompt(
                 _("It seems your did not give your name. You need to do it for the game to run properly."),
-                function (name) {
-                    if (name && name.trim()) {
-                        setSetting("PlayerName", name.trim());
+                function (newName) {
+                    if (newName && newName.trim()) {
+                        setSetting("PlayerName", newName.trim());
                     }
 
                     repromptName(f);

diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index b90b55992d6034234ea0a6b7130a52555eec083e..a5b19a2a9cbab012befb168021febd8c18b9d772 100644 (file)
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -1009,7 +1009,7 @@ function handleRequest(request, response) {
                             "script-src 'self'; " +
                             "style-src 'self'; " +
                             "img-src 'self'; " +
-                            (disableCSP ? "" : "connect-src 'self' " + (
+                            (disableCSP ? "connect-src *; " : "connect-src 'self' " + (
                                 // uzbl (like Safari 9 / iPad 2) does not like insecure websockets on the
                                 // same port with connect-src 'self'
                                 // See https://github.com/w3c/webappsec-csp/issues/7