Decide that it wasn't quite appropriate :(

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index c1b282bfafbe7b7ef4bf5a536c94a31b3cb2c839..1ce7d8f5a6e26d4fc18c7e5522b07a0c9dfc1744 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -19,15 +19,12 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include <time.h>
 #include <string>
 #ifdef GCC3
 #include <ext/hash_map>
 #else
 #include <hash_map>
 #endif
-#include <map>
-#include <sstream>
 #include <vector>
 #include <deque>
 #include "users.h"
@@ -35,32 +32,19 @@ using namespace std;
 #include "globals.h"
 #include "modules.h"
 #include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
-#include "command_parse.h"
 #include "cmd_kill.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern time_t TIME;
 extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -72,7 +56,7 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
        {
                log(DEBUG,"into kill mechanism");
                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnKill(user,u,parameters[1]));
+                FOREACH_RESULT(I_OnKill,OnKill(user,u,parameters[1]));
                 if (MOD_RESULT) {
                        log(DEBUG,"A module prevented the kill with result %d",MOD_RESULT);
                         return;
@@ -85,7 +69,7 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
                        snprintf(killreason,MAXBUF,"[%s] Killed (%s (%s))",Config->ServerName,user->nick,parameters[1]);
                        WriteCommonExcept(u,"QUIT :%s",killreason);
 
-                       FOREACH_MOD OnRemoteKill(user,u,killreason);
+                       FOREACH_MOD(I_OnRemoteKill,OnRemoteKill(user,u,killreason));
                        
                        user_hash::iterator iter = clientlist.find(u->nick);
                        if (iter != clientlist.end())
@@ -97,8 +81,6 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
                        {
                                purge_empty_chans(u);
                        }
-                       if (u->fd > -1)
-                               fd_ref_table[u->fd] = NULL;
                        delete u;
                }
                else