1) Fix for nickname overruled with new cullList stuff -- we have to change their...

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 36b348c565d8fb5e65bc2aceb1ee265fa75a4f02..ae327166d73416da6579f73aa26540308fad2807 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -2,101 +2,73 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_kill.h"
+#include "wildcard.h"
+#include "commands/cmd_kill.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern user_hash clientlist;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_kill(Instance);
+}
 
-void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /KILL
+ */
+CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       userrec *u = Find(parameters[0]);
+       /* 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;
 
-        log(DEBUG,"kill: %s %s",parameters[0],parameters[1]);
        if (u)
        {
-               log(DEBUG,"into kill mechanism");
-               int MOD_RESULT = 0;
-                FOREACH_RESULT(OnKill(user,u,parameters[1]));
-                if (MOD_RESULT) {
-                       log(DEBUG,"A module prevented the kill with result %d",MOD_RESULT);
-                        return;
-                }
+               FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
-               if (u->fd < 0)
+               if (MOD_RESULT)
+                       return CMD_FAILURE;
+
+               if (!IS_LOCAL(u))
                {
                        // remote kill
-                       WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
-                       snprintf(killreason,MAXBUF,"[%s] Killed (%s (%s))",Config->ServerName,user->nick,parameters[1]);
-                       WriteCommonExcept(u,"QUIT :%s",killreason);
-
-                       FOREACH_MOD OnRemoteKill(user,u,killreason);
+                       ServerInstance->SNO->WriteToSnoMask('k',"Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
+                       snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", ServerInstance->Config->ServerName, user->nick, parameters[1]);
+                       u->WriteCommonExcept("QUIT :%s", killreason);
+                       FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
                        
-                       user_hash::iterator iter = clientlist.find(u->nick);
-                       if (iter != clientlist.end())
-                       {
-                               log(DEBUG,"deleting user hash value %d",iter->second);
-                               clientlist.erase(iter);
-                       }
-                       if (u->registered == 7)
-                       {
-                               purge_empty_chans(u);
-                       }
-                       delete u;
+                       userrec::QuitUser(ServerInstance, u, parameters[1]);
                }
                else
                {
                        // local kill
-                       log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, Config->ServerName,user->dhost,user->nick,parameters[1]);
-                       WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, Config->ServerName,user->dhost,user->nick,parameters[1]);
-                       WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
-                       snprintf(killreason,MAXBUF,"Killed (%s (%s))",user->nick,parameters[1]);
-                       kill_link(u,killreason);
+                       ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+                       user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+                       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);
                }
        }
        else
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
-}
 
+       return CMD_SUCCESS;
+}