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

Better namechange-setter initally

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-15 14:26:05 +01:00
parent 572df5a8e5
commit 6d97345719
6 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/handlers/chat.js
View File

@@ -134,8 +134,8 @@ function all_chat(msg, guid, offline, socket) {
} }
function namechange(data, guid, socket, tried) { function namechange(data, guid, socket, tried) {
if(!data.hasOwnProperty("channel") || /*if(!data.hasOwnProperty("channel") ||
typeof(data.channel) != "string") return; typeof(data.channel) != "string") return;*/
var pw = ""; var pw = "";
var new_password; var new_password;
var first = false; var first = false;
@@ -162,7 +162,6 @@ function namechange(data, guid, socket, tried) {
new_password = Functions.decrypt_string(socket.zoff_id, data.new_password); new_password = Functions.decrypt_string(socket.zoff_id, data.new_password);
} }
} }
var password = Functions.decrypt_string(socket.zoff_id, pw); var password = Functions.decrypt_string(socket.zoff_id, pw);
db.collection("registered_users").find({"_id": name.toLowerCase()}, function(err, docs) { db.collection("registered_users").find({"_id": name.toLowerCase()}, function(err, docs) {
var accepted_password = false; var accepted_password = false;
@@ -198,8 +197,10 @@ function namechange(data, guid, socket, tried) {
db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: name}}, function(err, docs) { db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: name}}, function(err, docs) {
//socket.emit('name', {type: "name", accepted: true}); //socket.emit('name', {type: "name", accepted: true});
if(old_name != name && !first) { if(old_name != name && !first) {
io.to(data.channel).emit('chat', {from: old_name, msg: " changed name to " + name}); if(data.hasOwnProperty("channel") && typeof(data.channel) == "string") {
io.sockets.emit('chat.all', {from: old_name , msg: " changed name to " + name, channel: data.channel}); io.to(data.channel).emit('chat', {from: old_name, msg: " changed name to " + name});
io.sockets.emit('chat.all', {from: old_name , msg: " changed name to " + name, channel: data.channel});
}
} }
}); });
}); });

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

@@ -7,9 +7,7 @@ var Admin = {
Admin.logged_in = msg; Admin.logged_in = msg;
if(!msg) return; if(!msg) return;
w_p = false; w_p = false;
if(adminpass == undefined || adminpass == "") {
//adminpass = Crypt.get_pass(chan.toLowerCase());
}
if(Admin.logged_in) { if(Admin.logged_in) {
$("#thumbnail_form").css("display", "inline-block"); $("#thumbnail_form").css("display", "inline-block");
$("#description_form").css("display", "inline-block"); $("#description_form").css("display", "inline-block");
@@ -224,9 +222,7 @@ var Admin = {
userpass: Crypt.crypt_pass(pass_send), userpass: Crypt.crypt_pass(pass_send),
userpass_changed: userpass_changed userpass_changed: userpass_changed
}; };
if(userpass_changed){
//Crypt.set_userpass(chan.toLowerCase(), userpass);
}
emit("conf", configs); emit("conf", configs);
}, },

2
server/public/assets/js/channel.js
View File

@@ -131,8 +131,6 @@ var Channel = {
Crypt.init(); Crypt.init();
Chat.namechange("", true, true);
setup_auth_listener(); setup_auth_listener();
if(Crypt.get_offline()){ if(Crypt.get_offline()){

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

@@ -24,7 +24,11 @@ var Chat = {
socket.emit("namechange", {name: name, channel: chan.toLowerCase(), new_password: new_password, old_password: old_password}); socket.emit("namechange", {name: name, channel: chan.toLowerCase(), new_password: new_password, old_password: old_password});
} else if(first) { } else if(first) {
socket.emit("namechange", {channel: chan.toLowerCase(), initial: initial, first: true}); var to_send = {initial: initial, first: true};
if(chan != undefined && chan != "") {
to_send.channel = chan.toLowerCase();
}
socket.emit("namechange", to_send);
} }
}, },

6
server/public/assets/js/crypt.js
View File

@@ -22,12 +22,6 @@ var Crypt = {
} }
if(window.location.pathname != "/") { if(window.location.pathname != "/") {
try {
//Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase());
} catch(err) {
//Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase());
}
Hostcontroller.change_enabled(conf_arr.remote); Hostcontroller.change_enabled(conf_arr.remote);
if(conf_arr.width != 100) Player.set_width(conf_arr.width); if(conf_arr.width != 100) Player.set_width(conf_arr.width);
} }

7
server/public/assets/js/listeners.js
View File

@@ -26,8 +26,6 @@ var frontpage = 1;
var empty_clear = false; var empty_clear = false;
var adminpass = ""; var adminpass = "";
var showDiscovery = false; var showDiscovery = false;
var temp_name = "";
var temp_pass = "";
var player_ready = false; var player_ready = false;
var viewers = 1; var viewers = 1;
var temp_user_pass = ""; var temp_user_pass = "";
@@ -199,15 +197,12 @@ $().ready(function(){
/*if(chan != undefined && (Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) !== "")){ /*if(chan != undefined && (Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) !== "")){
emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()}); emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()});
}*/ }*/
if(chan != undefined) {
Chat.namechange("", true, true);
}
$(".connect_error").fadeOut(function(){ $(".connect_error").fadeOut(function(){
$(".connect_error").remove(); $(".connect_error").remove();
Materialize.toast("Connected!", 2000, "green lighten"); Materialize.toast("Connected!", 2000, "green lighten");
}); });
} }
Chat.namechange("", true, true);
}); });
/*socket.on("name", function(data) { /*socket.on("name", function(data) {