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

Added functionality to add songs from another channel

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-21 15:01:14 +01:00
parent 8d14b14c65
commit 859062204c
13 changed files with 230 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/handlers/io.js
View File

@@ -233,6 +233,10 @@ module.exports = function() {
Frontpage.frontpage_lists(msg, socket);
});
socket.on('import_zoff', function(msg) {
ListChange.addFromOtherList(msg, guid, socket);
})
socket.on('now_playing', function(list, fn)
{
List.now_playing(list, fn, socket);
@@ -448,7 +452,9 @@ module.exports = function() {
db.collection(coll + "_settings").find(function(err, docs) {
Functions.getSessionAdminUser(Functions.getSession(socket), coll, function(userpass, adminpass) {
obj.pass = userpass;
if(userpass != "" || obj.pass == undefined) {
obj.pass = userpass;
}
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (obj.hasOwnProperty('pass') && docs[0].userpass == crypto.createHash('sha256').update(Functions.decrypt_string(socketid, obj.pass)).digest("base64")))) {
Functions.check_inlist(coll, guid, socket, offline);
List.send_play(coll, socket);