Bad w00tie bad, /who isnt checking +s for channel /who!

[user/henk/code/inspircd.git] / src / cmd_kill.cpp

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index dfcf99590e0600b13729820de1919f7e6adc8362..e2a8d8824b4dc0cbdb28e260afc9a55dfdeb21ca 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -14,20 +14,26 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
+#include "wildcard.h"
 #include "commands/cmd_kill.h"
 
-
-
 extern "C" command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_kill(Instance);
 }
 
+/** Handle /KILL
+ */
 CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
+       /* Allow comma seperated lists of users for /KILL (thanks w00t) */
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+               return CMD_SUCCESS;
+
        userrec *u = ServerInstance->FindNick(parameters[0]);
        char killreason[MAXBUF];
        int MOD_RESULT = 0;
@@ -68,7 +74,8 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 
                        if (u == user)
                        {
-                               FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS));
+                               std::string original_command = std::string("KILL ") + u->nick + " :"+parameters[1];
+                               FOREACH_MOD(I_OnPostCommand,OnPostCommand("KILL", parameters, pcnt, user, CMD_SUCCESS,original_command));
                                return CMD_USER_DELETED;
                        }
                        DELETE(u);
@@ -81,6 +88,9 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                        ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
                        snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
                        userrec::QuitUser(ServerInstance, u, killreason);
+
+                       if (u == user)
+                               return CMD_USER_DELETED;
                }
        }
        else