moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix IPban dropdown option

This commit is contained in:
calzoneman 2013-06-06 19:13:56 -04:00
parent 2c069c26b3
commit ca7a9e83a5
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channel.js
View File

@ -647,13 +647,12 @@ Channel.prototype.sendRankStuff = function(user) {
var ents = []; var ents = [];
for(var ip in this.ipbans) { for(var ip in this.ipbans) {
if(this.ipbans[ip] != null) { if(this.ipbans[ip] != null) {
var name; var name = [];
if(ip in this.logins) { if(ip in this.logins) {
name = this.logins[ip].join(", "); name = this.logins[ip];
}
else {
name = this.ipbans[ip][0];
} }
name.push(this.ipbans[ip][0]);
name = name.join(", ");
var id = this.hideIP(ip); var id = this.hideIP(ip);
var disp = ip; var disp = ip;
if(user.rank < Rank.Siteadmin) { if(user.rank < Rank.Siteadmin) {

13
chatcommand.js
View File

@ -39,7 +39,7 @@ function handle(chan, user, msg, data) {
handleBan(chan, user, msg.substring(5).split(" ")); handleBan(chan, user, msg.substring(5).split(" "));
} }
else if(msg.indexOf("/ipban ") == 0) { else if(msg.indexOf("/ipban ") == 0) {
handleIPBan(chan, user, msg.substring(5).split(" ")); handleIPBan(chan, user, msg.substring(7).split(" "));
} }
else if(msg.indexOf("/unban ") == 0) { else if(msg.indexOf("/unban ") == 0) {
handleUnban(chan, user, msg.substring(7).split(" ")); handleUnban(chan, user, msg.substring(7).split(" "));
@ -86,12 +86,11 @@ function handleIPBan(chan, user, args) {
break; break;
} }
} }
if(kickee && kickee.rank < user.rank) { if(kickee) {
chan.logger.log("*** " + user.name + " banned " + args[0]); chan.tryIPBan(user, {
args[0] = ""; id: chan.hideIP(kickee.ip),
var reason = args.join(" "); name: kickee.name
chan.kick(kickee, "(banned) " + reason); });
chan.banIP(user, kickee);
} }
} }
} }

2
www/assets/js/functions.js
View File

@ -130,7 +130,7 @@ function addUserDropdown(entry, name) {
a.text("IP Ban"); a.text("IP Ban");
a.click(function() { a.click(function() {
socket.emit("chatMsg", { socket.emit("chatMsg", {
msg: "/ban " + name msg: "/ipban " + name
}); });
}); });