X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcmd_kill.cpp;h=bb5d47f12af9a6ce00006719faa9bcecc8888277;hb=6080b1693d8f831fb5dcd9d956d6abdddaa9bed6;hp=ba9ac9dc7ad93ccaca5c5d5bba35231f67e8a620;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index ba9ac9dc7..bb5d47f12 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -21,53 +21,49 @@
 #include "users.h"
 #include "modules.h"
 #include "commands.h"
-#include "helperfuncs.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;
+
 
 void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	userrec *u = Find(parameters[0]);
+	userrec *u = ServerInstance->FindNick(parameters[0]);
 	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;
 		}
 
 		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, MAXQUIT,"[%s] Killed (%s (%s))", Config->ServerName, user->nick, parameters[1]);
-			WriteCommonExcept(u, "QUIT :%s", 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);
+			user_hash::iterator iter = ServerInstance->clientlist.find(u->nick);
 
-			if (iter != clientlist.end())
+			if (iter != ServerInstance->clientlist.end())
 			{
-				log(DEBUG,"deleting user hash value %d", iter->second);
-				clientlist.erase(iter);
+				ServerInstance->Log(DEBUG,"deleting user hash value %d", iter->second);
+				ServerInstance->clientlist.erase(iter);
 			}
 
-			if (u->registered == 7)
+			if (u->registered == REG_ALL)
 			{
-				purge_empty_chans(u);
+				u->PurgeEmptyChannels();
 			}
 
 			DELETE(u);
@@ -75,15 +71,16 @@ 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, 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]);
+			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]);
-			kill_link(u, killreason);
+			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]);
 	}
 }
+