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' of github.com:nixolas1/Zoff

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-05-06 14:31:18 +02:00
parent f5495dba43 d27d9c953e
commit d54f6c2c68
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
php/nochan.php
View File

@@ -81,6 +81,9 @@ if(isset($_GET['chan'])){
</div> </div>
<div class="section"> <div class="section">
<div id="preloader" class="progress">
<div class="indeterminate"></div>
</div>
<ul class="row" id="channels"> <ul class="row" id="channels">
<div id="chan-html" class="hide"> <div id="chan-html" class="hide">
<li id="chan-card" class="col s12 m4 l3"> <li id="chan-card" class="col s12 m4 l3">

17
server/server.js
View File

@@ -309,11 +309,19 @@ io.on('connection', function(socket){
io.sockets.emit(coll+",viewers", lists[coll].length); io.sockets.emit(coll+",viewers", lists[coll].length);
} }
adminpass = list[2]; adminpass = "";
var error = false;
if(list != "5" && list != "100" && list != "101" && list != "150" && list !== undefined)
{
adminpass = list[2];
}else if(list == "5" || list == "100" || list == "101" || list == "150"){
error = true;
}
console.log(adminpass); console.log(adminpass);
if(adminpass !== undefined && adminpass !== null) if(adminpass !== undefined && adminpass !== null && adminpass != "")
var hash = hash_pass(adminpass); var hash = hash_pass(adminpass);
else else
var hash = ""; var hash = "";
@@ -321,14 +329,15 @@ io.on('connection', function(socket){
db.collection(coll).find({views: {$exists:true}}, function(err, docs){ db.collection(coll).find({views: {$exists:true}}, function(err, docs){
console.log(adminpass); console.log(adminpass);
console.log(docs[0]["adminpass"]); console.log(docs[0]["adminpass"]);
if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "")) console.log(error);
if(!docs[0]["skip"] || (docs[0]["adminpass"] == hash && docs[0]["adminpass"] != "") || error)
{ {
if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10 if((lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10
|| lists[coll].length != 2)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != "")) || lists[coll].length != 2)) || (docs[0]["adminpass"] == adminpass && docs[0]["adminpass"] != ""))
{ {
change_song(coll); change_song(coll);
socket.emit("toast", "skip"); socket.emit("toast", "skip");
}else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2) }else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2 && !error)
{ {
socket.emit("toast", "notyetskip"); socket.emit("toast", "notyetskip");
}else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){ }else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){

1
static/js/nochan.js
View File

@@ -48,6 +48,7 @@ function populate_channels(lists)
num++; num++;
if(num>19)break; if(num>19)break;
} }
document.getElementById("preloader").style.display = "none";
document.getElementById("searches").innerHTML = output; document.getElementById("searches").innerHTML = output;
Materialize.showStaggeredList('#channels'); Materialize.showStaggeredList('#channels');
$("#search").focus(); $("#search").focus();

2
static/js/youtube.js
View File

@@ -203,7 +203,7 @@ function errorHandler(newState)
var failsafe = ytplayer.getVideoUrl().split("https://www.youtube.com/watch"); var failsafe = ytplayer.getVideoUrl().split("https://www.youtube.com/watch");
if(newState.data == 5 || newState.data == 100 || newState.data == 101 || newState.data == 150) if(newState.data == 5 || newState.data == 100 || newState.data == 101 || newState.data == 150)
{ {
socket.emit("skip"); socket.emit("skip", newState.data);
} }
} }