mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-10-29 18:00:23 +00:00
Removed logging
This commit is contained in:
Kasper Rynning-Tønnesen
64
js/admin.js
64
js/admin.js
@@ -57,40 +57,6 @@ function submitAdmin(form)
|
||||
configs = [voting, addsongs, longsongs, frontpage, allvideos, removeplay, adminpass, skipping, shuffling];
|
||||
|
||||
socket.emit("conf", configs);
|
||||
/*
|
||||
confRes = $.ajax({
|
||||
type: "POST",
|
||||
url: "php/change.php",
|
||||
async: false,
|
||||
data: "conf=start&vote="+voting+"&addsongs="+addsongs+"&longsongs="+longsongs+"&frontpage="+frontpage+
|
||||
"&allvideos="+allvideos+"&removeplay="+removeplay+"&pass="+adminpass+"&skip="+skipping+"&shuffling="+shuffling,
|
||||
|
||||
success: function() {
|
||||
console.log("configurations response: "+response);
|
||||
}
|
||||
}).responseText;
|
||||
|
||||
pass_corr = confRes;
|
||||
|
||||
if(pass_corr=="correct"){
|
||||
//$("#adminPanel").addClass("success");
|
||||
document.getElementById("sBar").innerHTML = "Successfully applied settings.";
|
||||
$("#sBar").addClass("opacityFull");
|
||||
document.getElementById("passbox").value = "";
|
||||
}else{
|
||||
document.getElementById("eBar").innerHTML = "Error: Wrong Admin Password!";
|
||||
$("#eBar").addClass("opacityFull");
|
||||
document.getElementById("passbox").value = "";/*$("#adminPanel").addClass("fadeerror");
|
||||
}
|
||||
|
||||
console.log(pass_corr);
|
||||
updateList();
|
||||
setTimeout(function(){
|
||||
$("#adminPanel").removeClass("success");
|
||||
$("#adminPanel").removeClass("fadeerror");
|
||||
$("#eBar").removeClass("opacityFull");
|
||||
$("#sBar").removeClass("opacityFull");
|
||||
},1500);*/
|
||||
}
|
||||
|
||||
function remove_bar()
|
||||
@@ -107,34 +73,4 @@ function shuffle(form)
|
||||
{
|
||||
console.log(adminpass);
|
||||
socket.emit('shuffle', adminpass);
|
||||
/*
|
||||
confRes = $.ajax({
|
||||
type: "GET",
|
||||
url: "php/change.php",
|
||||
async: false,
|
||||
data: "shuffle=true&pass="+adminpass,
|
||||
|
||||
success: function() {
|
||||
console.log("configurations response: "+response);
|
||||
}
|
||||
}).responseText;
|
||||
if(confRes == "shuffled")
|
||||
{
|
||||
document.getElementById("sBar").innerHTML = "Successfully shuffled playlist.";
|
||||
$("#sBar").addClass("opacityFull");
|
||||
updateList();
|
||||
}else if(confRes = "wrong!"){
|
||||
document.getElementById("eBar").innerHTML = "Error: Wrong Admin Password!";
|
||||
$("#eBar").addClass("opacityFull");
|
||||
}else if(confRes = "size"){
|
||||
document.getElementById("eBar").innerHTML = "Error: Empty Playlist!";
|
||||
$("#eBar").addClass("opacityFull");
|
||||
}
|
||||
setTimeout(function(){
|
||||
$("#adminPanel").removeClass("success");
|
||||
$("#adminPanel").removeClass("fadeerror");
|
||||
$("#eBar").removeClass("opacityFull");
|
||||
$("#sBar").removeClass("opacityFull");
|
||||
},1500);
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -35,8 +35,6 @@ function populate_list(msg)
|
||||
{
|
||||
console.log(msg[obj]);
|
||||
}
|
||||
/*list = msg[0];
|
||||
conf = list.conf;*/
|
||||
|
||||
$("#wrapper").empty();
|
||||
|
||||
|
||||
@@ -44,15 +44,12 @@ var playing = false;
|
||||
|
||||
socket.on(chan.toLowerCase()+",np", function(obj)
|
||||
{
|
||||
console.log("gotten shit");
|
||||
console.log(obj)
|
||||
video_id = obj[0][0]["id"];
|
||||
conf = obj[1][0];
|
||||
time = obj[2];
|
||||
seekTo = time - conf["startTime"];
|
||||
song_title = obj[0][0]["title"];
|
||||
getTitle(song_title, viewers);
|
||||
console.log(seekTo);
|
||||
if(player_ready)
|
||||
{
|
||||
if(ytplayer.getVideoUrl().split('v=')[1] != video_id)
|
||||
@@ -139,15 +136,12 @@ function onPlayerStateChange(newState) {
|
||||
switch(newState.data)
|
||||
{
|
||||
case -1:
|
||||
console.log("not started");
|
||||
break;
|
||||
case 0:
|
||||
socket.emit("end", video_id);
|
||||
playing = false;
|
||||
console.log("ended");
|
||||
break;
|
||||
case 1:
|
||||
console.log("playing");
|
||||
playing = true;
|
||||
if(document.getElementById("playpause").className == "play")
|
||||
{
|
||||
@@ -161,7 +155,6 @@ function onPlayerStateChange(newState) {
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
console.log("paused");
|
||||
paused = true;
|
||||
if(document.getElementById("playpause").className == "pause")
|
||||
{
|
||||
@@ -170,7 +163,6 @@ function onPlayerStateChange(newState) {
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
console.log("buffering");
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -178,12 +170,10 @@ function onPlayerStateChange(newState) {
|
||||
function getTitle(titt, v)
|
||||
{
|
||||
var outPutWord = v > 1 ? "viewers" : "viewer";
|
||||
console.log(titt);
|
||||
var title= titt.replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&");
|
||||
document.title = title + " • Zöff";
|
||||
|
||||
if(!window.mobilecheck()){
|
||||
console.log("ikke mobil");
|
||||
document.getElementsByName('v')[0].placeholder = title + " • " + v + " " + outPutWord;
|
||||
}else
|
||||
{
|
||||
@@ -225,7 +215,6 @@ function setBGimage(id){
|
||||
var bg = new Image();
|
||||
bg.src = "http://img.youtube.com/vi/"+id+"/0.jpg";
|
||||
$("#bgimage").addClass("noopacity");
|
||||
//console.log(bg);
|
||||
bg.addEventListener("load", function(){
|
||||
setTimeout(function(){
|
||||
$("#bgimage").css("background-image", "url("+bg.src+")");
|
||||
|
||||
@@ -47,14 +47,13 @@ io.on('connection', function(socket){
|
||||
|
||||
var complete = function(list, curr, tot, name)
|
||||
{
|
||||
console.log("inside");
|
||||
if(list.length > 0)
|
||||
{
|
||||
var id = list[0]["id"];
|
||||
var title = list[0]["title"];
|
||||
try{
|
||||
var viewers = lists[name].length;
|
||||
}catch(err){console.log("no viewers"); var viewers = 0;}
|
||||
}catch(err){var viewers = 0;}
|
||||
var to_push = [viewers, id, title, name];
|
||||
playlists_to_send.push(to_push);
|
||||
}
|
||||
@@ -73,7 +72,6 @@ io.on('connection', function(socket){
|
||||
coll = list[0].toLowerCase();
|
||||
guid = list[1];
|
||||
|
||||
console.log("user connected to list: " + list[0]);
|
||||
if(lists[coll] == undefined)
|
||||
{
|
||||
lists[coll] = [];
|
||||
@@ -92,7 +90,6 @@ io.on('connection', function(socket){
|
||||
db.collection(coll).insert({"addsongs":false, "adminpass":"", "allvideos":true, "frontpage":true, "longsongs":true, "removeplay": false, "shuffle": false, "skip": true, "skips": [], "startTime":get_time(), "views": [], "vote": false}, function(err, docs)
|
||||
{
|
||||
db.collection(coll).find().sort({votes:-1}, function(err, docs) {
|
||||
console.log(docs);
|
||||
socket.emit(coll, docs);
|
||||
//send_play(coll, socket);
|
||||
});
|
||||
@@ -113,7 +110,6 @@ io.on('connection', function(socket){
|
||||
|
||||
socket.on('add', function(arr)
|
||||
{
|
||||
console.log("add songs");
|
||||
var id = arr[0];
|
||||
var title = arr[1];
|
||||
var hash = hash_pass(arr[2]);
|
||||
@@ -146,7 +142,6 @@ io.on('connection', function(socket){
|
||||
|
||||
socket.on('vote', function(msg)
|
||||
{
|
||||
console.log("vote on list: " + msg[0].toLowerCase());
|
||||
if(msg[2] == "del")
|
||||
del(msg);
|
||||
else
|
||||
@@ -168,18 +163,15 @@ io.on('connection', function(socket){
|
||||
|
||||
socket.on('skip', function(list)
|
||||
{
|
||||
console.log("skip on list: " + list);
|
||||
db.collection(coll).find({skip: "true"}, function(err, docs){
|
||||
if(docs.length == 1)
|
||||
{
|
||||
console.log(lists[coll]);
|
||||
if(lists[coll].length/2 <= docs[0]["skips"]+1)
|
||||
{
|
||||
change_song(coll);
|
||||
}else{
|
||||
db.collection(coll).update({views:{$exists:true}}, {$push:{guids:guid}}, function(err, d){
|
||||
//reply with skips or something
|
||||
console.log("skipped without effect");
|
||||
socket.emit("skipping", [docs[0]["skips"]+1, lists[coll].length])
|
||||
});
|
||||
}
|
||||
@@ -203,8 +195,6 @@ io.on('connection', function(socket){
|
||||
var hash = hash_pass(adminpass);
|
||||
|
||||
db.collection(coll).find({views:{$exists:true}}, function(err, docs){
|
||||
console.log(docs[0]["adminpass"]);
|
||||
console.log(params);
|
||||
if(docs[0]["adminpass"] == "" || docs[0]["adminpass"] == hash)
|
||||
{
|
||||
db.collection(coll).update({views:{$exists:true}}, {
|
||||
@@ -238,14 +228,16 @@ io.on('connection', function(socket){
|
||||
sort_list(coll, undefined, false);
|
||||
return;
|
||||
}else{
|
||||
console.log(docs);
|
||||
num = Math.floor(Math.random()*1000000);
|
||||
db.collection(coll).update({id:docs["id"]}, {$set:{added:num}}, function(err, d)
|
||||
{});
|
||||
}
|
||||
{
|
||||
socket.emit("success_settings", "Shuffled Playlist!");
|
||||
});
|
||||
}
|
||||
});
|
||||
}else
|
||||
socket.emit("error_settings", "Wrong Password!");
|
||||
});
|
||||
});
|
||||
|
||||
socket.on('disconnect', function()
|
||||
@@ -263,7 +255,6 @@ io.on('connection', function(socket){
|
||||
|
||||
socket.on('pos', function()
|
||||
{
|
||||
console.log("EMITTED");
|
||||
send_play(coll, socket);
|
||||
});
|
||||
});
|
||||
@@ -272,10 +263,8 @@ function del(params)
|
||||
{
|
||||
var coll = params[0].toLowerCase();
|
||||
db.collection(coll).find({views:{$exists:true}}, function(err, docs){
|
||||
console.log(docs);
|
||||
if(docs[0]["adminpass"] == hash_pass(params[4]))
|
||||
{
|
||||
console.log("del");
|
||||
db.collection(coll).remove({id:params[1]}, function(err, docs){
|
||||
sort_list(coll, undefined, false);
|
||||
})
|
||||
@@ -366,10 +355,8 @@ function sort_list(coll, socket, send)
|
||||
function send_play(coll, socket)
|
||||
{
|
||||
db.collection(coll).find({now_playing:true}, function(err, np){
|
||||
console.log("sending now_playing to " + coll+",np");
|
||||
db.collection(coll).find({views:{$exists:true}}, function(err, conf){
|
||||
toSend = [np,conf,get_time()];
|
||||
console.log(toSend);
|
||||
if(socket === undefined)
|
||||
io.sockets.emit(coll+",np", toSend);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user