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

Fixed shuffle issue where users not logged in could not shuffle

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-06-09 15:30:10 +02:00
parent e2cc65750a
commit e974befe15
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/server.js
View File

@@ -431,11 +431,12 @@ io.on('connection', function(socket){
socket.on('shuffle', function(pass) socket.on('shuffle', function(pass)
{ {
if(pass !== undefined && pass !== null && pass != "") if(pass !== undefined && pass !== null)
{ {
check_inlist(coll, guid, socket, name); check_inlist(coll, guid, socket, name);
var hash = hash_pass(pass); if(pass == "") var hash = pass;
else var hash = hash_pass(pass);
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs !== null && docs.length != 0 && ((docs[0]["adminpass"] == hash || docs[0]["adminpass"] == "") || docs[0]["shuffle"] == false)) if(docs !== null && docs.length != 0 && ((docs[0]["adminpass"] == hash || docs[0]["adminpass"] == "") || docs[0]["shuffle"] == false))
{ {

3
static/js/admin.js
View File

@@ -146,7 +146,8 @@ function remove_bar()
function shuffle() function shuffle()
{ {
socket.emit('shuffle', adminpass); var pass_to_send = adminpass !== undefined ? adminpass : "";
socket.emit('shuffle', pass_to_send);
} }
function rnd(arr) function rnd(arr)

3
static/js/youtube.js
View File

@@ -85,8 +85,7 @@ $(document).ready(function()
}; };
img.crossOrigin = 'Anonymous'; img.crossOrigin = 'Anonymous';
img.src = 'http://img.youtube.com/vi/NuEfvIca0XU/mqdefault.jpg'; img.src = 'http://img.youtube.com/vi/NuEfvIca0XU/mqdefault.jpg';
*/ */
setup_youtube_listener(chan); setup_youtube_listener(chan);
//Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000); //Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000);
$("#settings").sideNav({ $("#settings").sideNav({