kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index ac3f3686d93e368443209f84a7da5cf1574934c4..0084da9dcab7f1190a1fd268cd59ff9aa1a63357 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -14,31 +14,15 @@
  * ---------------------------------------------------
  */
 
-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 "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 "message.h"
 #include "commands.h"
-#include "inspstring.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_kill.h"
+#include "commands/cmd_kill.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
@@ -46,30 +30,30 @@ extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern user_hash clientlist;
 
-void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_kill::Handle (const 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");
-                FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
+               FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
-                if (MOD_RESULT)
+               if (MOD_RESULT)
                {
                        log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
-                        return;
-                }
+                       return;
+               }
 
                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]);
+                       snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", Config->ServerName, user->nick, parameters[1]);
                        WriteCommonExcept(u, "QUIT :%s", killreason);
                        FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
                        
@@ -81,12 +65,12 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
                                clientlist.erase(iter);
                        }
 
-                       if (u->registered == 7)
+                       if (u->registered == REG_ALL)
                        {
                                purge_empty_chans(u);
                        }
 
-                       delete u;
+                       DELETE(u);
                }
                else
                {
@@ -94,7 +78,7 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
                        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]);
+                       snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
                        kill_link(u, killreason);
                }
        }
@@ -103,5 +87,3 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
                WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]);
        }
 }
-
-