Fixed minor security bugs

This commit is contained in:
Kasper Rynning-Tønnesen
2015-11-23 21:25:26 +01:00
parent 94bb7c4ceb
commit 8f87938402
4 changed files with 7 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@@ -82,8 +82,8 @@ var Admin = {
socket.on("conf", function(msg) socket.on("conf", function(msg)
{ {
Admin.set_conf(msg[0]);
Crypt.init(); Crypt.init();
Admin.set_conf(msg[0]);
if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Admin.beginning && Crypt.get_pass(chan.toLowerCase()) != ""){ if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Admin.beginning && Crypt.get_pass(chan.toLowerCase()) != ""){
socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]); socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
Admin.beginning = false; Admin.beginning = false;
@@ -160,10 +160,12 @@ var Admin = {
document.getElementsByName(names[i])[0].checked = (conf_array[names[i]] === true); document.getElementsByName(names[i])[0].checked = (conf_array[names[i]] === true);
$("input[name="+names[i]+"]").attr("disabled", hasadmin); $("input[name="+names[i]+"]").attr("disabled", hasadmin);
} }
//console.log(hasadmin);
console.log(Crypt.get_pass(chan.toLowerCase()));
if((hasadmin)){ if((hasadmin)){
Admin.display_logged_out(); Admin.display_logged_out();
}else if(!hasadmin){ }else if(!hasadmin && Crypt.get_pass(chan.toLowerCase()) === undefined){
$("#password").attr("placeholder", "Create channel password"); $("#password").attr("placeholder", "Create channel password");
} }

View File

@@ -19,7 +19,6 @@ var Playercontrols = {
{ {
//vol = localStorage.getItem("volume"); //vol = localStorage.getItem("volume");
vol = (Crypt.get_volume()); vol = (Crypt.get_volume());
}else{ }else{
vol = 100; vol = 100;
//localStorage.setItem("volume", vol); //localStorage.setItem("volume", vol);
@@ -39,7 +38,6 @@ var Playercontrols = {
} }
}); });
Playercontrols.choose_button(vol, false); Playercontrols.choose_button(vol, false);
Playercontrols.setVolume(ui.value);
//$("#volume").slider("value", ytplayer.getVolume()); //$("#volume").slider("value", ytplayer.getVolume());
}, },

View File

@@ -130,7 +130,7 @@ var Youtube = {
Youtube.readyLooks(); Youtube.readyLooks();
Playercontrols.initYoutubeControls(ytplayer); Playercontrols.initYoutubeControls(ytplayer);
Playercontrols.initSlider(); Playercontrols.initSlider();
ytplayer.setVolume(localStorage.getItem("volume")); ytplayer.setVolume(Crypt.get_volume());
}, },
readyLooks: function() readyLooks: function()