From 09b2d3ba6bd282982b609ff84410e2bb0e2f9d49 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Wed, 20 Jan 2016 18:48:43 +0200
Subject: Add error message if the input is not sane

---
 index.js | 124 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 65 insertions(+), 59 deletions(-)

(limited to 'index.js')

diff --git a/index.js b/index.js
index 23849b6..055b1c7 100644
--- a/index.js
+++ b/index.js
@@ -4,85 +4,91 @@ var io = require('socket.io')(http);
 var port = (process.env.PORT || 5000);
 var LOGBROADCAST = true;
 //get port from commandline parameteres
-if (process.argv.length== 3){
-  port = process.argv[2];
+if (process.argv.length == 3) {
+    port = process.argv[2];
 }
 
 var que = [];
 var pws = {};
 
-app.get('/', function(req, res){
-  res.sendFile(__dirname + '/f/templates/index.html');
+app.get('/', function(req, res) {
+    res.sendFile(__dirname + '/f/templates/index.html');
 });
-app.get('/adm', function(req, res){
-  res.sendFile(__dirname + '/f/templates/adm.html');
+app.get('/adm', function(req, res) {
+    res.sendFile(__dirname + '/f/templates/adm.html');
 });
-app.get('/log', function(req, res){
-  res.sendFile(__dirname + '/f/templates/log.html');
+app.get('/log', function(req, res) {
+    res.sendFile(__dirname + '/f/templates/log.html');
 });
 
 
 //route all paths beginning with /f/ to real files 
-app.get('/f/*', function(req, res){
-  res.sendFile(__dirname + req.path);
+app.get('/f/*', function(req, res) {
+    res.sendFile(__dirname + req.path);
 });
 
 
-io.on('connection', function(socket){
-  var uid = Date.now();
-  var pw =  Math.random()*10000000 + Math.random()*10000000 -1;
-  pws[uid] = pw;
-
-
-  socket.emit("userinfo",{"uid":uid,"pw":pw});
-  socket.emit("quedata",que);
-  socket.on("logsubscribe",function(data){
-    log("User "+data.uid+ " has subscribed in logging");
-    socket.join("log");
-  });  
-   
-  socket.on("queadd",function(data){
-		log("User " +data.name+ " on row " +data.row+" added to queue");
-    data.qid= Date.now();
-
-  	que.push(data);
-		io.emit("quedata",que);
-  });
-	socket.on("quepopfirst",function(data){
-  	    var deleted = que.shift();
-        log("admin deleted "+ deleted.name +" from queue");
-		io.emit("quedata",que);
-
-  });
-  socket.on("quedelete",function(data){
-    for (var i=0;i<que.length;i++){
-      if (que[i].qid == data.qid){
-        if (data.pw != pws[que[i].uid]){
-          socket.emit("err",{"msg":"you're not allowed to remove this entry"});
-          break;
-        }
-        log(que[i].name+" deleted himself from queue");
-        que.splice(i,1);
-        io.emit("quedata",que);
-        break;
-      }
-    }
-  });
+io.on('connection', function(socket) {
+    var uid = Date.now();
+    var pw = Math.random() * 10000000 + Math.random() * 10000000 - 1;
+    pws[uid] = pw;
+
+
+    socket.emit("userinfo", {
+        "uid": uid,
+        "pw": pw
+    });
+
+    socket.emit("quedata", que);
+    socket.on("logsubscribe", function(data) {
+        log("User " + data.uid + " has subscribed in logging");
+        socket.join("log");
+    });
+
+    socket.on("queadd", function(data) {
+        log("User " + data.name + " on row " + data.row + " added to queue");
+        data.qid = Date.now();
 
+        que.push(data);
+        io.emit("quedata", que);
+    });
+
+    socket.on("quepopfirst", function(data) {
+        var deleted = que.shift();
+        log("admin deleted " + deleted.name + " from queue");
+        io.emit("quedata", que);
+
+    });
+
+    socket.on("quedelete", function(data) {
+        for (var i = 0; i < que.length; i++) {
+            if (que[i].qid == data.qid) {
+                if (data.pw != pws[que[i].uid]) {
+                    socket.emit("err", {
+                        "msg": "you're not allowed to remove this entry"
+                    });
+                    break;
+                }
+                log(que[i].name + " deleted himself from queue");
+                que.splice(i, 1);
+                io.emit("quedata", que);
+                break;
+            }
+        }
+    });
 });
 
-function getTimeString()
-{
+function getTimeString() {
     return Date().toLocaleString();
 }
 
-function log(msg){
-    var logmsg=getTimeString()+": "+msg;
+function log(msg) {
+    var logmsg = getTimeString() + ": " + msg;
     console.log(logmsg);
-    if(LOGBROADCAST){
-      io.to("log").emit("logmessage",logmsg);
+    if (LOGBROADCAST) {
+        io.to("log").emit("logmessage", logmsg);
     }
 }
-http.listen(port, function(){
-  log('listening on port '+port);
-});
+http.listen(port, function() {
+    log('listening on port ' + port);
+});
\ No newline at end of file
-- 
cgit v1.3