X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kline.cpp;h=e841129592a1659a6fe3635f4d7fe467fd6ad217;hb=8f9d0a68cd77b6a78eccfa7df9c1045d453ce581;hp=a14c2bf9930579bae94b1f6e855ddfc1d5b4ed2d;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index a14c2bf99..e84112959 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.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
@@ -14,53 +14,28 @@
  * ---------------------------------------------------
  */
 
-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 "inspircd_config.h"
+#include "configreader.h"
+#include "hash_map.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"
+#include "commands/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;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_kline::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -68,23 +43,26 @@ void cmd_kline::Handle (char **parameters, int pcnt, userrec *user)
 	{
 		if (host_matches_everyone(parameters[0],user))
 			return;
+
 		add_kline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD OnAddKLine(duration(parameters[1]), user, parameters[2], parameters[0]);
+		FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration(parameters[1]), user, parameters[2], parameters[0]));
+
 		if (!duration(parameters[1]))
 		{
-			WriteOpers("*** %s added permenant K-line for %s.",user->nick,parameters[0]);
+			WriteOpers("*** %s added permanent K-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
 			WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
 		}
+
 		apply_lines(APPLY_KLINES);
 	}
 	else
 	{
 		if (del_kline(parameters[0]))
 		{
-			FOREACH_MOD OnDelKLine(user, parameters[0]);
+			FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
 			WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]);
 		}
 		else
@@ -93,5 +71,3 @@ void cmd_kline::Handle (char **parameters, int pcnt, userrec *user)
 		}
 	}
 }
-
-