X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_eline.cpp;h=cf5e13414cae94e4f3fdad49d3013903682326b1;hb=6dfc98470938a932ddee0100f515658dffe94438;hp=eafa83913dc4583300dae60aaff7aa6f3e4fc307;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index eafa83913..cf5e13414 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.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,84 +14,52 @@
  * ---------------------------------------------------
  */
 
-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_eline.h"
+#include "commands/cmd_eline.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
+extern ServerConfig* Config;
 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_eline::Handle (char **parameters, int pcnt, userrec *user)
 {
-        if (pcnt >= 3)
-        {
+	if (pcnt >= 3)
+	{
 		if (host_matches_everyone(parameters[0],user))
 			return;
-                add_eline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD OnAddELine(duration(parameters[1]), user, parameters[2], parameters[0]);
-                if (!duration(parameters[1]))
-                {
-                        WriteOpers("*** %s added permenant E-line for %s.",user->nick,parameters[0]);
-                }
-                else
-                {
-                        WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
-                }
-        }
-        else
-        {
-                if (del_eline(parameters[0]))
-                {
-			FOREACH_MOD OnDelELine(user, parameters[0]);
-                        WriteOpers("*** %s Removed E-line on %s.",user->nick,parameters[0]);
-                }
-                else
-                {
-                        WriteServ(user->fd,"NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
-                }
-        }
-	// no need to apply the lines for an eline
-}
 
+		add_eline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+		FOREACH_MOD(I_OnAddELine,OnAddELine(duration(parameters[1]), user, parameters[2], parameters[0]));
+
+		if (!duration(parameters[1]))
+		{
+			WriteOpers("*** %s added permanent E-line for %s.",user->nick,parameters[0]);
+		}
+		else
+		{
+			WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+		}
+	}
+	else
+	{
+		if (del_eline(parameters[0]))
+		{
+			FOREACH_MOD(I_OnDelELine,OnDelELine(user, parameters[0]));
+			WriteOpers("*** %s Removed E-line on %s.",user->nick,parameters[0]);
+		}
+		else
+		{
+			WriteServ(user->fd,"NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
+		}
+	}
 
+	// no need to apply the lines for an eline
+}