X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=ac3f3686d93e368443209f84a7da5cf1574934c4;hb=ced58c3be3f1da8dcf70c3904e5fe4bdaabf0e3d;hp=36b348c565d8fb5e65bc2aceb1ee265fa75a4f02;hpb=a76eb059c7bf26512d8db3afdb1a78024212a337;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 36b348c56..ac3f3686d 100644
--- 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
@@ -50,52 +50,57 @@ 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);
+		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);
                         return;
                 }
 
-		if (u->fd < 0)
+		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 OnRemoteKill(user,u,killreason);
+			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);
 			}
+
 			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]);
 	}
 }