Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index c1b282bfafbe7b7ef4bf5a536c94a31b3cb2c839..44594a0e14872906d14c478be2166b9169a54f08 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
@@ -14,107 +14,76 @@
  * ---------------------------------------------------
  */
 
-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 "inspircd_config.h"
+#include "hash_map.h"
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#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)
 {
        userrec *u = Find(parameters[0]);
        char killreason[MAXBUF];
+       int MOD_RESULT = 0;
+
+       log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
 
-        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;
-                }
+               log(DEBUG, "into kill mechanism");
+               FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
-               if (u->fd < 0)
+               if (MOD_RESULT)
                {
-                       // 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);
+                       log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
+                       return;
+               }
 
-                       FOREACH_MOD OnRemoteKill(user,u,killreason);
+               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(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);
+                               log(DEBUG,"deleting user hash value %d", iter->second);
                                clientlist.erase(iter);
                        }
+
                        if (u->registered == 7)
                        {
                                purge_empty_chans(u);
                        }
-                       if (u->fd > -1)
-                               fd_ref_table[u->fd] = NULL;
+
                        delete u;
                }
                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);
+                       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);
                }
        }
        else
        {
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]);
        }
 }
-
-