From ca7a9e83a5769bdc990f443080ae68d4779226c7 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 6 Jun 2013 19:13:56 -0400
Subject: [PATCH] Fix IPban dropdown option

---
 channel.js                 |  9 ++++-----
 chatcommand.js             | 13 ++++++-------
 www/assets/js/functions.js |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/channel.js b/channel.js
index 2e19e294..f67eb8e5 100644
--- a/channel.js
+++ b/channel.js
@@ -647,13 +647,12 @@ Channel.prototype.sendRankStuff = function(user) {
         var ents = [];
         for(var ip in this.ipbans) {
             if(this.ipbans[ip] != null) {
-                var name;
+                var name = [];
                 if(ip in this.logins) {
-                    name = this.logins[ip].join(", ");
-                }
-                else {
-                    name = this.ipbans[ip][0];
+                    name = this.logins[ip];
                 }
+                name.push(this.ipbans[ip][0]);
+                name = name.join(", ");
                 var id = this.hideIP(ip);
                 var disp = ip;
                 if(user.rank < Rank.Siteadmin) {
diff --git a/chatcommand.js b/chatcommand.js
index a134574a..59a0ade0 100644
--- a/chatcommand.js
+++ b/chatcommand.js
@@ -39,7 +39,7 @@ function handle(chan, user, msg, data) {
         handleBan(chan, user, msg.substring(5).split(" "));
     }
     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) {
         handleUnban(chan, user, msg.substring(7).split(" "));
@@ -86,12 +86,11 @@ function handleIPBan(chan, user, args) {
                 break;
             }
         }
-        if(kickee && kickee.rank < user.rank) {
-            chan.logger.log("*** " + user.name + " banned " + args[0]);
-            args[0] = "";
-            var reason = args.join(" ");
-            chan.kick(kickee, "(banned) " + reason);
-            chan.banIP(user, kickee);
+        if(kickee) {
+            chan.tryIPBan(user, {
+                id: chan.hideIP(kickee.ip),
+                name: kickee.name
+            });
         }
     }
 }
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index ca1715d4..8450eaa5 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -130,7 +130,7 @@ function addUserDropdown(entry, name) {
         a.text("IP Ban");
         a.click(function() {
             socket.emit("chatMsg", {
-                msg: "/ban " + name
+                msg: "/ipban " + name
             });
         });