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 issue with password not being set correctly

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-05 15:53:13 +02:00
parent 9d06c2bda7
commit 7714729093
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
server/public/assets/js/admin.js
View File

@@ -309,8 +309,9 @@ var Admin = {
removeplay = form.removeplay.checked; removeplay = form.removeplay.checked;
skipping = form.skip.checked; skipping = form.skip.checked;
shuffling = form.shuffle.checked; shuffling = form.shuffle.checked;
var pass_send = userpass == '' ? userpass : CryptoJS.SHA256(userpass).toString();
configs = { configs = {
voting: voting, addsongs: addsongs, longsongs: longsongs, frontpage: frontpage, allvideos: allvideos, removeplay: removeplay, adminpass: adminpass, skipping: skipping, shuffling: shuffling, userpass: CryptoJS.SHA256(userpass).toString(), userpass_changed: userpass_changed voting: voting, addsongs: addsongs, longsongs: longsongs, frontpage: frontpage, allvideos: allvideos, removeplay: removeplay, adminpass: adminpass, skipping: skipping, shuffling: shuffling, userpass: pass_send, userpass_changed: userpass_changed
}; };
Crypt.set_userpass(chan.toLowerCase(), CryptoJS.SHA256(userpass).toString()); Crypt.set_userpass(chan.toLowerCase(), CryptoJS.SHA256(userpass).toString());

1
server/server.js
View File

@@ -715,6 +715,7 @@ io.on('connection', function(socket){
var skipping = params.skipping; var skipping = params.skipping;
var shuffling = params.shuffling; var shuffling = params.shuffling;
var userpass = params.userpass; var userpass = params.userpass;
if((!params.userpass_changed && frontpage) || (!params.userpass_changed && userpass == "")) { if((!params.userpass_changed && frontpage) || (!params.userpass_changed && userpass == "")) {
userpass = ""; userpass = "";
} else if(params.userpass_changed && userpass != "") { } else if(params.userpass_changed && userpass != "") {