Merge branch 'master' into feature/chromecast

server/handlers/list_change.js

@@ -8,8 +8,24 @@ function add_function(arr, coll, guid, offline, socket) {
             return;
         }
 
-        var start = arr.start;
+        try {
-        var end = arr.end;
+            var start = parseInt(arr.start);
+            var end = parseInt(arr.end);
+            if(start < 0) {
+                socket.emit("toast", "faulty_start_end");
+                return;
+            }
+            if(end < 0) {
+                socket.emit("toast", "faulty_start_end");
+                return;
+            }
+            if(start >= end) {
+                start = 0;
+                arr.duration = end - start;
+            }
+        } catch(e) {
+            return;
+        }
 
         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)))) {

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;