KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/chromecast

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-27 16:05:22 +01:00
parent 4270ce8027 9268db4bcc
commit 8d40748a81
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/handlers/list_change.js
View File

@@ -8,8 +8,24 @@ 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 < 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)))) {

3
server/public/assets/js/admin.js
View File

@@ -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;