X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kline.cpp;h=670cb29501dda14c871df03315815aa897489846;hb=46ff0bed0047c4cd05828c5f46dce63176e5084b;hp=9c840b4696804e6ab3aa03546c49e1db7af14d98;hpb=60f91c5c3c313115dc4e92af9d728c493d8bc6aa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 9c840b469..670cb2950 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -2,99 +2,80 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_kline.h"
-
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
+#include "commands/cmd_kline.h"
 
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_kline(Instance);
+}
 
-void cmd_kline::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /KLINE
+ */
+CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (host_matches_everyone(parameters[0],user))
-			return;
-
-		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 (ServerInstance->HostMatchesEveryone(parameters[0],user))
+			return CMD_FAILURE;
 
-		if (!duration(parameters[1]))
-		{
-			WriteOpers("*** %s added permenant K-line for %s.",user->nick,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;
 		}
-		else
+		else if (strchr(parameters[0],'!'))
 		{
-			WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+			user->WriteServ("NOTICE %s :*** K-Line cannot contain a nickname!",user->nick);
+			return CMD_FAILURE;
 		}
 
-		apply_lines(APPLY_KLINES);
+		if (ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
+		{
+			int to_apply = APPLY_KLINES;
+
+			FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+	
+			if (!ServerInstance->Duration(parameters[1]))
+			{
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
+				to_apply |= APPLY_PERM_ONLY;
+			}
+			else
+			{
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick,parameters[0],
+						ServerInstance->TimeString(c_requires_crap).c_str());
+			}
+
+			ServerInstance->XLines->apply_lines(to_apply);
+		}
 	}
 	else
 	{
-		if (del_kline(parameters[0]))
+		if (ServerInstance->XLines->del_kline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
-			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
 		{
-			WriteServ(user->fd,"NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
 		}
 	}
-}
 
+	return CMD_SUCCESS;
+}