X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kline.cpp;h=a72ea085d549e1a66793d4a5b81dcbc76230cf5b;hb=dc7927e17cffb2ee3c50ef9f037ed873d378f679;hp=5bdba041dfe05d71962f09208b69d1dbb2b6b1d8;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 5bdba041d..a72ea085d 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -3,71 +3,70 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *		       E-mail:
+ *		<brain@chatspike.net>
+ *		<Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <time.h>
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "hash_map.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
 #include "commands/cmd_kline.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
 
-void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_kline(Instance);
+}
+
+CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (host_matches_everyone(parameters[0],user))
-			return;
+		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+			return CMD_FAILURE;
 
-		add_kline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration(parameters[1]), user, parameters[2], parameters[0]));
+		if (!strchr(parameters[0],'@'))
+		{       
+			user->WriteServ("NOTICE %s :*** K-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
+			return CMD_FAILURE;
+		}
+
+		ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+		FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 
-		if (!duration(parameters[1]))
+		if (!ServerInstance->Duration(parameters[1]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent K-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
 
-		apply_lines(APPLY_KLINES);
+		ServerInstance->XLines->apply_lines(APPLY_KLINES);
 	}
 	else
 	{
-		if (del_kline(parameters[0]))
+		if (ServerInstance->XLines->del_kline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
 			user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
 		}
 	}
+
+	return CMD_SUCCESS;
 }
+