From d39cbaa25b71492c7a40ccb412c246ba4e51406e Mon Sep 17 00:00:00 2001
From: Tim Windelschmidt <fionera@fionera.de>
Date: Tue, 27 Sep 2016 21:11:28 +0200
Subject: [PATCH] Fixed the UTF8 and Space error

---
 node/routes/index.js | 18 ++++++++++--------
 node/statusbot.js    |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/node/routes/index.js b/node/routes/index.js
index 0af143a..b4d55b7 100755
--- a/node/routes/index.js
+++ b/node/routes/index.js
@@ -17,19 +17,21 @@ exports.form = function (req, res) {
 
     if (/^([0-9a-f]{2}[:-]){5}([0-9a-f]{2})$/.exec(mac)) {
         if (action == "add") {
-	console.log("add mac request mac: "+mac + " label " + label + " ip: " + ip);
-            if (/^[0-9a-zA-Z]+$/.exec(label)) {
-                snmpMac.add(mac, label, function (err) {
-                    console.log("add mac result: " + err);
-                    req.flash('status', err == null ? "" : "database error: " + err);
-                    res.redirect("/db");
-                });
+            if (label) {
+                if(label.split('').length > 1) {
+                    console.log("add mac request mac: " +mac + " label " + label + " ip: " + ip);
+                    snmpMac.add(mac, '"' + label + '"', function (err) {
+                        console.log("add mac result: " + err);
+                        req.flash('status', err == null ? "" : "database error: " + err);
+                        res.redirect("/db");
+                    });
+                }
             } else {
                 req.flash('status', 'label is invalid ("^[0-9a-zA-Z]+$")');
                 res.redirect("/db");
             }
         } else if (action == "remove") {
-	console.log("remove mac request mac: "+mac + " label " + label + " ip: " + ip);
+        	console.log("remove mac request mac: "+mac + " label " + '"' + label + '"' + " ip: " + ip);
             snmpMac.delete(mac, function (err) {
                 console.log("delete mac result: " + err);
                 req.flash('status', err == null ? "" : "database error: " + err);
diff --git a/node/statusbot.js b/node/statusbot.js
index 1bebcaa..9b2fd56 100755
--- a/node/statusbot.js
+++ b/node/statusbot.js
@@ -109,7 +109,7 @@ app.use(express.static('public'));
 app.use(cookieParser());
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(bodyParser.json({ extended: true }));
-app.use(cookieSession({secret: 'steam-stalker', cookie: {maxAge: 60000}}));
+app.use(cookieSession({secret: 'ctdo', cookie: {maxAge: 60000}}));
 app.use(flash());
 
 app.set('/views');