More tweaks

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 86a014267ace4f861cef96a44f84ebf62a5da697..01b49ae6ba195564c149f770d8f51048b18b63d7 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -21,13 +21,10 @@
 #include "users.h"
 #include "modules.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_kill.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+
 
 void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
@@ -35,16 +32,16 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
        char killreason[MAXBUF];
        int MOD_RESULT = 0;
 
-       log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
+       ServerInstance->Log(DEBUG,"kill: %s %s", parameters[0], parameters[1]);
 
        if (u)
        {
-               log(DEBUG, "into kill mechanism");
+               ServerInstance->Log(DEBUG, "into kill mechanism");
                FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
 
                if (MOD_RESULT)
                {
-                       log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
+                       ServerInstance->Log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT);
                        return;
                }
 
@@ -60,7 +57,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 
                        if (iter != ServerInstance->clientlist.end())
                        {
-                               log(DEBUG,"deleting user hash value %d", iter->second);
+                               ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
                                ServerInstance->clientlist.erase(iter);
                        }
 
@@ -74,7 +71,7 @@ void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
                else
                {
                        // local kill
-                       log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+                       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->WriteOpers("*** 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]);