From 8614ba0731231be5fea41f3c2e9bdc62bcefa24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 27 Feb 2018 15:24:36 +0100 Subject: [PATCH 1/4] Updated so start can't be after end --- server/handlers/list_change.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index 4073ba69..ba26a03e 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -11,6 +11,11 @@ function add_function(arr, coll, guid, offline, socket) { var start = arr.start; var end = arr.end; + if(start >= end) { + start = 0; + arr.duration = end - start; + } + db.collection(coll + "_settings").find(function(err, docs){ if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (arr.hasOwnProperty('pass') && docs[0].userpass == Functions.decrypt_string(socketid, arr.pass)))) { From 0383c035f45044421089268b1e8ce4888380e3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 27 Feb 2018 15:25:37 +0100 Subject: [PATCH 2/4] Forcing int --- server/handlers/list_change.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index ba26a03e..e375635d 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -8,12 +8,16 @@ function add_function(arr, coll, guid, offline, socket) { return; } - var start = arr.start; - var end = arr.end; + try { + var start = parseInt(arr.start); + var end = parseInt(arr.end); - if(start >= end) { - start = 0; - arr.duration = end - start; + if(start >= end) { + start = 0; + arr.duration = end - start; + } + } catch(e) { + return; } db.collection(coll + "_settings").find(function(err, docs){ From ded7fa9a145eb932aaade24e0fc7761a73c4794f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 27 Feb 2018 15:28:06 +0100 Subject: [PATCH 3/4] Added test for start or end lower than 0 --- server/handlers/list_change.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index e375635d..66818d71 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -11,7 +11,12 @@ function add_function(arr, coll, guid, offline, socket) { try { var start = parseInt(arr.start); var end = parseInt(arr.end); - + if(start < 0) { + start = 0; + } + if(end < 0) { + end = arr.duration; + } if(start >= end) { start = 0; arr.duration = end - start; From 9268db4bcc295517c28c5d9cb240da9ac5c7ac7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 27 Feb 2018 15:33:34 +0100 Subject: [PATCH 4/4] More errormessages --- server/handlers/list_change.js | 6 ++++-- server/public/assets/js/admin.js | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index 66818d71..89649c2c 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -12,10 +12,12 @@ function add_function(arr, coll, guid, offline, socket) { var start = parseInt(arr.start); var end = parseInt(arr.end); if(start < 0) { - start = 0; + socket.emit("toast", "faulty_start_end"); + return; } if(end < 0) { - end = arr.duration; + socket.emit("toast", "faulty_start_end"); + return; } if(start >= end) { start = 0; diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js index 15f6c76e..fb9aa9fd 100755 --- a/server/public/assets/js/admin.js +++ b/server/public/assets/js/admin.js @@ -7,6 +7,9 @@ var Admin = { case "suggested_thumbnail": msg = "The thumbnail has been suggested!"; break; + case "faulty_start_end": + msg = "You tried to send a faulty start/end value. Try again.."; + break; case "suggested_description": msg = "The description has been suggested!"; break;