mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-10-29 18:00:23 +00:00
Fixed so users that has blocked cookies still are able to play
This commit is contained in:
@@ -32,7 +32,6 @@ var Channel = {
|
|||||||
}
|
}
|
||||||
//Player.soundcloud_player = document.querySelector("#soundcloud_player");
|
//Player.soundcloud_player = document.querySelector("#soundcloud_player");
|
||||||
}
|
}
|
||||||
|
|
||||||
List.calculate_song_heights();
|
List.calculate_song_heights();
|
||||||
Admin.logged_in = false;
|
Admin.logged_in = false;
|
||||||
Admin.display_logged_out();
|
Admin.display_logged_out();
|
||||||
@@ -494,7 +493,8 @@ var Channel = {
|
|||||||
var add = "";
|
var add = "";
|
||||||
w_p = true;
|
w_p = true;
|
||||||
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
|
|
||||||
|
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
|
||||||
} else if(url_split[3] === "") {
|
} else if(url_split[3] === "") {
|
||||||
/*if(client) {
|
/*if(client) {
|
||||||
var host = window.location.hostname.split(".");
|
var host = window.location.hostname.split(".");
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ var Crypt = {
|
|||||||
if(Crypt.getCookie(name) === undefined) {
|
if(Crypt.getCookie(name) === undefined) {
|
||||||
cookie = Crypt.create_cookie(name);
|
cookie = Crypt.create_cookie(name);
|
||||||
}
|
}
|
||||||
|
if(cookie == undefined && name == "_opt") return {"volume":100,"width":100,"remote":true,"name":"","offline":false};
|
||||||
/*var key = btoa("0103060703080703080701") + btoa("0103060703080703080701");
|
/*var key = btoa("0103060703080703080701") + btoa("0103060703080703080701");
|
||||||
key = key.substring(0,32);
|
key = key.substring(0,32);
|
||||||
key = btoa(key);
|
key = btoa(key);
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ var gotten_np = false;
|
|||||||
var song_title = "";
|
var song_title = "";
|
||||||
var paused = false;
|
var paused = false;
|
||||||
var client = false;
|
var client = false;
|
||||||
|
var _VERSION;
|
||||||
|
try {
|
||||||
|
_VERSION = localStorage.getItem("VERSION");
|
||||||
|
} catch(e) {
|
||||||
|
_VERSION = 6;
|
||||||
|
}
|
||||||
var startTime = 0;
|
var startTime = 0;
|
||||||
var full_playlist;
|
var full_playlist;
|
||||||
var hostMode = false;
|
var hostMode = false;
|
||||||
@@ -383,7 +389,7 @@ function change_offline(enabled, already_offline){
|
|||||||
socket.emit("pos", {channel: chan.toLowerCase()});
|
socket.emit("pos", {channel: chan.toLowerCase()});
|
||||||
var add = "";
|
var add = "";
|
||||||
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
|
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
|
||||||
Helper.removeClass("#controls", "ewresize");
|
Helper.removeClass("#controls", "ewresize");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ function emit_list() {
|
|||||||
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
|
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
|
||||||
if(p == undefined) p = "";*/
|
if(p == undefined) p = "";*/
|
||||||
if(socket.id) {
|
if(socket.id) {
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
|
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
|
||||||
} else {
|
} else {
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
emit_list();
|
emit_list();
|
||||||
@@ -666,7 +666,7 @@ function get_list_listener(){
|
|||||||
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
||||||
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
|
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
|
||||||
if(p == undefined) p = "";*/
|
if(p == undefined) p = "";*/
|
||||||
socket.emit("list", { offline: offline, version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
|
socket.emit("list", { offline: offline, version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
|
||||||
});
|
});
|
||||||
socket.on("id_chromecast", function(msg) {
|
socket.on("id_chromecast", function(msg) {
|
||||||
chromecast_specs_sent = true;
|
chromecast_specs_sent = true;
|
||||||
@@ -746,11 +746,15 @@ function setup_host_listener(id){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function enable_debug(){
|
function enable_debug(){
|
||||||
|
try {
|
||||||
localStorage.debug = true;
|
localStorage.debug = true;
|
||||||
|
} catch(e){}
|
||||||
}
|
}
|
||||||
|
|
||||||
function disable_debug(){
|
function disable_debug(){
|
||||||
|
try {
|
||||||
localStorage.debug = false;
|
localStorage.debug = false;
|
||||||
|
} catch(e){}
|
||||||
}
|
}
|
||||||
|
|
||||||
function embed_code(autoplay, width, height, color, embed_code, embed_local){
|
function embed_code(autoplay, width, height, color, embed_code, embed_local){
|
||||||
@@ -859,7 +863,7 @@ function change_offline(enabled, already_offline){
|
|||||||
socket.on("color", Player.setBGimage);
|
socket.on("color", Player.setBGimage);
|
||||||
socket.emit("pos", {channel: chan.toLowerCase()});
|
socket.emit("pos", {channel: chan.toLowerCase()});
|
||||||
var add = "";
|
var add = "";
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
|
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
|
||||||
Helper.removeClass("#controls", "ewresize");
|
Helper.removeClass("#controls", "ewresize");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,13 @@ var Helper = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
log: function(to_log) {
|
log: function(to_log) {
|
||||||
if(localStorage.debug === "true") {
|
var _DEBUG;
|
||||||
|
try {
|
||||||
|
_DEBUG = localStorage.getItem("debug");
|
||||||
|
} catch(e) {
|
||||||
|
_DEBUG = false;
|
||||||
|
}
|
||||||
|
if(_DEBUG === "true") {
|
||||||
console.log("------------ " + new Date() + " ------------");/*RemoveLogging:skip*/
|
console.log("------------ " + new Date() + " ------------");/*RemoveLogging:skip*/
|
||||||
for(var i = 0; i < to_log.length; i++) {
|
for(var i = 0; i < to_log.length; i++) {
|
||||||
console.log(to_log[i]);/*RemoveLogging:skip*/
|
console.log(to_log[i]);/*RemoveLogging:skip*/
|
||||||
|
|||||||
@@ -41,7 +41,9 @@ var Hostcontroller = {
|
|||||||
Playercontrols.visualVolume(arr.value);
|
Playercontrols.visualVolume(arr.value);
|
||||||
Player.setVolume(arr.value);
|
Player.setVolume(arr.value);
|
||||||
Player.soundcloud_player.setVolume(arr.value / 100);
|
Player.soundcloud_player.setVolume(arr.value / 100);
|
||||||
|
try {
|
||||||
localStorage.setItem("volume", arr.value);
|
localStorage.setItem("volume", arr.value);
|
||||||
|
} catch(e){}
|
||||||
Playercontrols.choose_button(arr.value, false);
|
Playercontrols.choose_button(arr.value, false);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
} else if(arr.type == "channel") {
|
} else if(arr.type == "channel") {
|
||||||
@@ -57,7 +59,7 @@ var Hostcontroller = {
|
|||||||
w_p = true;
|
w_p = true;
|
||||||
var add = "";
|
var add = "";
|
||||||
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
|
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
|
||||||
|
|
||||||
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
|
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
|
||||||
} else if(arr.type == "pause") {
|
} else if(arr.type == "pause") {
|
||||||
|
|||||||
@@ -5,6 +5,12 @@ var client = false;
|
|||||||
if(domain.length > 0 && domain[0] == "client") {
|
if(domain.length > 0 && domain[0] == "client") {
|
||||||
client = true;
|
client = true;
|
||||||
}
|
}
|
||||||
|
var _VERSION;
|
||||||
|
try {
|
||||||
|
_VERSION = localStorage.getItem("VERSION");
|
||||||
|
} catch(e) {
|
||||||
|
_VERSION = 6;
|
||||||
|
}
|
||||||
var soundcloud_enabled = true;
|
var soundcloud_enabled = true;
|
||||||
var local_new_channel = false;
|
var local_new_channel = false;
|
||||||
var sc_need_initialization = false;
|
var sc_need_initialization = false;
|
||||||
@@ -101,11 +107,13 @@ var guid = "";
|
|||||||
var castSession;
|
var castSession;
|
||||||
var width_timeout;
|
var width_timeout;
|
||||||
var tap_target_timeout;
|
var tap_target_timeout;
|
||||||
|
var debug;
|
||||||
if(localStorage.debug === undefined){
|
try {
|
||||||
var debug = false;
|
if(localStorage.debug === undefined){
|
||||||
|
debug = false;
|
||||||
localStorage.debug = debug;
|
localStorage.debug = debug;
|
||||||
}
|
}
|
||||||
|
}catch(e){debug = false;}
|
||||||
|
|
||||||
var image_timeout;
|
var image_timeout;
|
||||||
var result_html;
|
var result_html;
|
||||||
@@ -204,15 +212,23 @@ window.zoff = {
|
|||||||
|
|
||||||
window.addEventListener("DOMContentLoaded", function() {
|
window.addEventListener("DOMContentLoaded", function() {
|
||||||
addDynamicListeners();
|
addDynamicListeners();
|
||||||
if(!localStorage.getItem("VERSION") || parseInt(localStorage.getItem("VERSION")) != VERSION) {
|
if(!_VERSION || parseInt(_VERSION) != VERSION) {
|
||||||
|
try {
|
||||||
localStorage.setItem("VERSION", VERSION);
|
localStorage.setItem("VERSION", VERSION);
|
||||||
|
} catch(e){}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!fromFront && window.location.pathname != "/") Channel.init();
|
if(!fromFront && window.location.pathname != "/") Channel.init();
|
||||||
else if(!fromChannel && window.location.pathname == "/"){
|
else if(!fromChannel && window.location.pathname == "/"){
|
||||||
Frontpage.init();
|
Frontpage.init();
|
||||||
}
|
}
|
||||||
if(!localStorage.ok_cookie){
|
var okCookie;
|
||||||
|
try {
|
||||||
|
okCookie = localStorage.ok_cookie;
|
||||||
|
} catch(e) {
|
||||||
|
okCookie = false;
|
||||||
|
}
|
||||||
|
if(!okCookie){
|
||||||
before_toast();
|
before_toast();
|
||||||
M.toast({html: "This website uses cookies! <a class='waves-effect waves-light btn light-green' href='#' id='cookieok' style='cursor:pointer;pointer-events:all;margin-left:10px;'> ok</a><a class='waves-effect waves-light btn orange lighten' href='#cookies' id='cookieinfo' style='cursor:pointer;pointer-events:all;margin-left:10px;'> info</a>", displayLength: 10000000});
|
M.toast({html: "This website uses cookies! <a class='waves-effect waves-light btn light-green' href='#' id='cookieok' style='cursor:pointer;pointer-events:all;margin-left:10px;'> ok</a><a class='waves-effect waves-light btn orange lighten' href='#cookies' id='cookieinfo' style='cursor:pointer;pointer-events:all;margin-left:10px;'> info</a>", displayLength: 10000000});
|
||||||
}
|
}
|
||||||
@@ -404,7 +420,13 @@ initializeCastApi = function() {
|
|||||||
Helper.css(".castButton", "display", "block");
|
Helper.css(".castButton", "display", "block");
|
||||||
Helper.addClass(".volume-container", "volume-container-cast");
|
Helper.addClass(".volume-container", "volume-container-cast");
|
||||||
cast_ready_connect = true;
|
cast_ready_connect = true;
|
||||||
if((!localStorage.getItem("_chSeen") || localStorage.getItem("_chSeen") != "seen") && !client) {
|
var _chSeen;
|
||||||
|
try {
|
||||||
|
_chSeen = localStorage.getItem("_chSeen");
|
||||||
|
} catch(e){
|
||||||
|
_chSeen = false;
|
||||||
|
}
|
||||||
|
if((!_chSeen || _chSeen != "seen") && !client) {
|
||||||
Helper.css(".castButton", "display", "block");
|
Helper.css(".castButton", "display", "block");
|
||||||
showDiscovery = true;
|
showDiscovery = true;
|
||||||
var elem = document.querySelector('.tap-target');
|
var elem = document.querySelector('.tap-target');
|
||||||
@@ -413,7 +435,9 @@ initializeCastApi = function() {
|
|||||||
tap_target_timeout = setTimeout(function() {
|
tap_target_timeout = setTimeout(function() {
|
||||||
instance.close();
|
instance.close();
|
||||||
}, 4000);
|
}, 4000);
|
||||||
|
try {
|
||||||
localStorage.setItem("_chSeen", "seen");
|
localStorage.setItem("_chSeen", "seen");
|
||||||
|
} catch(e){}
|
||||||
Helper.removeClass('.castButton', 'castButton-white-active');
|
Helper.removeClass('.castButton', 'castButton-white-active');
|
||||||
}
|
}
|
||||||
} else if(event.castState == "NO_DEVICES_AVAILABLE"){
|
} else if(event.castState == "NO_DEVICES_AVAILABLE"){
|
||||||
@@ -528,7 +552,9 @@ function addDynamicListeners() {
|
|||||||
addListener("click", '#cookieok', function(e) {
|
addListener("click", '#cookieok', function(e) {
|
||||||
this.preventDefault();
|
this.preventDefault();
|
||||||
M.Toast.getInstance(e.parentElement).dismiss();
|
M.Toast.getInstance(e.parentElement).dismiss();
|
||||||
|
try {
|
||||||
localStorage.ok_cookie = true;
|
localStorage.ok_cookie = true;
|
||||||
|
} catch(e){}
|
||||||
});
|
});
|
||||||
|
|
||||||
addListener("click", "#cookieinfo", function(e) {
|
addListener("click", "#cookieinfo", function(e) {
|
||||||
@@ -703,7 +729,7 @@ function addDynamicListeners() {
|
|||||||
temp_user_pass = document.getElementById("user-pass-input").value;
|
temp_user_pass = document.getElementById("user-pass-input").value;
|
||||||
|
|
||||||
document.getElementById("user-pass-input").value = "";
|
document.getElementById("user-pass-input").value = "";
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
|
socket.emit("list", {version: parseInt(_VERSION), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
|
||||||
} else {
|
} else {
|
||||||
M.Modal.getInstance(document.getElementById("user_password")).close();
|
M.Modal.getInstance(document.getElementById("user_password")).close();
|
||||||
userpass = document.getElementById("user-pass-input").value;
|
userpass = document.getElementById("user-pass-input").value;
|
||||||
@@ -729,7 +755,7 @@ function addDynamicListeners() {
|
|||||||
if(user_auth_started) {
|
if(user_auth_started) {
|
||||||
temp_user_pass = document.getElementById("user-pass-input").value;
|
temp_user_pass = document.getElementById("user-pass-input").value;
|
||||||
document.getElementById("user-pass-input").value = "";
|
document.getElementById("user-pass-input").value = "";
|
||||||
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
|
socket.emit("list", {version: parseInt(_VERSION), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
|
||||||
} else {
|
} else {
|
||||||
M.Modal.getInstance(document.getElementById("user_password")).close();
|
M.Modal.getInstance(document.getElementById("user_password")).close();
|
||||||
userpass = document.getElementById("user-pass-input").value;
|
userpass = document.getElementById("user-pass-input").value;
|
||||||
|
|||||||
Reference in New Issue
Block a user