Forward port of CullList and my bragging rights

[user/henk/code/inspircd.git] / src / cmd_eline.cpp

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 7927dcad1bd3431ab2f1a342367544bd00b93243..3a77c2b54e3c6d5e4004fbc8d762a82f7e4b0463 100644 (file)
--- 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,67 +14,52 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
 #include <string>
-#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 "xline.h"
-#include "inspstring.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_eline.h"
+#include "commands/cmd_eline.h"
 
 extern int MODCOUNT;
+extern ServerConfig* Config;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
 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]);
+
+               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 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]))
-                {
+
+               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(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]);
-                }
-        }
+                       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
 }
-
-