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 where setting password was faulty on entering channel a second time

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-02 11:38:02 +01:00
parent 5145b8d03c
commit 084550d84c
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/public/assets/js/chat.js
View File

@@ -11,7 +11,7 @@ var Chat = {
var password = input[1];
temp_name = name;
temp_pass = password;
password = Crypt.crypt_pass(password);
password = Crypt.crypt_chat_pass(password);
socket.emit("namechange", {name: name, channel: chan.toLowerCase(), password: password, first: first});
} else if(input.length == 3) {
var name = input[0];
@@ -21,8 +21,8 @@ var Chat = {
temp_name = name;
temp_pass = password;
new_password = Crypt.crypt_pass(new_password);
old_password = Crypt.crypt_pass(old_password);
new_password = Crypt.crypt_chat_pass(new_password);
old_password = Crypt.crypt_chat_pass(old_password);
socket.emit("namechange", {name: name, channel: chan.toLowerCase(), new_password: new_password, old_password: old_password});
} else {
@@ -83,7 +83,7 @@ var Chat = {
} else if($(".chat-tab-li a.active").attr("href") == "#all_chat") {
socket.emit("all,chat", {channel: chan.toLowerCase(), data: data.value});
} else {
socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_chat_pass(Crypt.get_userpass(chan.toLowerCase()))});
}
data.value = "";
return;