Not submitting password if no password on channel

This commit is contained in:
Kasper Rynning-Tønnesen
2017-02-07 12:16:23 +01:00
parent 40cb7d5597
commit e460ed34c2
3 changed files with 11 additions and 8 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -119,8 +119,11 @@ var Admin = {
conf: function(msg) conf: function(msg)
{ {
if(msg[0].adminpass == ""){
Crypt.remove_pass(chan.toLowerCase());
}
Admin.set_conf(msg[0]); Admin.set_conf(msg[0]);
if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Admin.beginning && Crypt.get_pass(chan.toLowerCase()) !== ""){ if(msg[0].adminpass !== "" && (Crypt.get_pass(chan.toLowerCase()) !== undefined && Admin.beginning && Crypt.get_pass(chan.toLowerCase()) !== "")){
socket.emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()}); socket.emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()});
Admin.beginning = false; Admin.beginning = false;
} }
@@ -134,7 +137,7 @@ var Admin = {
} }
else else
{ {
socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase()}); socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase()});
} }
}, },