some small fixes: grey-out send button if not ready

nodejs/package.json.in

@@ -1,10 +1,10 @@
 {
-    "name": "@PACKAGE_NAME@"
-  , "version": "@PACKAGE_VERSION@"
-  , "private": true
-  , "dependencies": {
-      "express": "2.5.8"
-    , "stylus": ">= 0.0.1"
-    , "ejs": ">= 0.0.1"
-  }
+    "name": "@PACKAGE_NAME@",
+    "version": "@PACKAGE_VERSION@",
+    "private": true,
+    "dependencies": {
+      "express": "2.5.8",
+        "stylus": ">= 0.0.1",
+        "ejs": ">= 0.0.1"
+    }
 }

nodejs/public/javascripts/safechat.js

@@ -425,7 +425,9 @@ function user(usr) {
         }
     }
     if ($("#chat").is(":visible") && usr.name==$("#recv").val()) { // same username as in receiver
-        $("#send").prop("disabled", !usr.exists);
+        $('#send').prop("disabled", !usr.exists);
+        $("label[for=send] img").css("opacity", usr.exists?"1.0":"0.4");
+        $("label[for=send] img").css("filter", usr.exists?"alpha(opacity=100)":"alpha(opacity=40)");
         if (usr.exists) success("recipient exists");
         else error("unknown recipient", true);
     }
@@ -567,8 +569,8 @@ function getpwd() {
 
 function deleteUser() {
     var uid = userid();
-    localStorage.pubkey = null;
-    localStorage.privkey = null;
+    localStorage.removeItem(pubkey);
+    localStorage.removeItem(privkey);
     error("user "+uid+" permanentely lost");
 }
 
@@ -657,10 +659,10 @@ function init() {
             cordova.plugins.backgroundMode.enable();
         }
     }, false);
-    socket.io.on("connect", connected());
-    socket.io.on("reconnect", connected());
-    socket.io.on("disconnect", disconnected());
-    socket.io.on("error", disconnected());
+    socket.io.on("connect", connected);
+    socket.io.on("reconnect", connected);
+    socket.io.on("disconnect", disconnected);
+    socket.io.on("error", disconnected);
     socket.on("login", loggedin);
     socket.on("fail", fail);
     socket.on("user", user);

nodejs/public/stylesheets/safechat.css

@@ -188,6 +188,10 @@ td:last-child {
 .clear {
   clear: both;
 }
+label[for=send] img {
+  opacity: 0.4;
+  filter: alpha(opacity=40); /* MSIE */
+}
 #msgs .msg {
   border: 1px solid black;
   margin: 1ex;

nodejs/routes/index.js

@@ -3,8 +3,12 @@
  * GET home page.
  */
 
+var package = require(__dirname+"/../package.json");
+
 exports.index = function(req, res) {
-  res.render('index', {
-      projecturl: "https://dev.marc.waeckerlin.org/redmine/projects/safechat/embedded/index.html"
+    res.render('index', {
+        projecturl: "https://dev.marc.waeckerlin.org/redmine/projects/safechat/embedded/index.html",
+        packagename: package.name,
+        packageversion: package.version
   });
 };

nodejs/sockets/index.js

@@ -7,7 +7,11 @@ module.exports = function(sql) {
         console.log("new client");
 
         function emit(signal, data) {
-            console.log("<- signal: "+signal);
+            if (typeof data == 'string') {
+                console.log("<- signal: "+signal+"("+data+")");
+            } else {
+                console.log("<- signal: "+signal);
+            }
             socket.emit(signal, data);
         }
 
@@ -51,11 +55,11 @@ module.exports = function(sql) {
             if (user.name=="safechat") return emit("fail", "user name safechat is reserved");
             sql.query("select name, pubkey from user where name = ?", [user.name],
                       function(err, res, flds) {
-                          if (err) return emit('fail', "login failed");
+                          if (err) return emit('fail', "login failed (db access) - "+err);
                           if (!res || res.length==0) {
                               sql.query("insert into user (name, pubkey) values (?,?)",
                                         [user.name, user.pubkey], function(err, res, flds) {
-                                            if (err) return emit('fail', "login failed");
+                                            if (err) return emit('fail', "create user failed - "+err);
                                             broadcast("user", {
                                                 name: user.name, exists: false, pubkey: user.pubkey
                                             });
@@ -63,7 +67,7 @@ module.exports = function(sql) {
                                         });
                           } else {
                               if (res[0].pubkey==user.pubkey) return emit('login');
-                              emit('fail', "login failed");
+                              emit('fail', "login failed - wrong credentials");
                           }
                       });
         });

nodejs/views/index.ejs

@@ -16,7 +16,7 @@
   <body>
     
     <div id="header" class="header">
-      <h1>Safe Chat @PACKAGE_VERSION@</h1>
+      <h1>Safe Chat <%= packageversion %></h1>
       <div id="togglemenu">
         <span id="username">[unknown]</span>
         <span id="connectionstatus">