Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 35cf82d886dd95de3c1ba1c8e731f264907e1f6a..0d01c0875896b826002f6b2b5d166eac1af960a5 100644 (file)
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.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,33 +14,17 @@
  * ---------------------------------------------------
  */
 
-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"
 
+extern ServerConfig* Config;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
@@ -51,8 +35,10 @@ void cmd_gline::Handle (char **parameters, int pcnt, userrec *user)
        {
                if (host_matches_everyone(parameters[0],user))
                        return;
+
                add_gline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD OnAddGLine(duration(parameters[1]), user, parameters[2], parameters[0]);
+               FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration(parameters[1]), user, parameters[2], parameters[0]));
+
                if (!duration(parameters[1]))
                {
                        WriteOpers("*** %s added permenant G-line for %s.",user->nick,parameters[0]);
@@ -61,13 +47,14 @@ void cmd_gline::Handle (char **parameters, int pcnt, userrec *user)
                {
                        WriteOpers("*** %s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
                }
+
                apply_lines(APPLY_GLINES);
        }
        else
        {
                if (del_gline(parameters[0]))
                {
-                       FOREACH_MOD OnDelGLine(user, parameters[0]);
+                       FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0]));
                        WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]);
                }
                else
@@ -76,5 +63,3 @@ void cmd_gline::Handle (char **parameters, int pcnt, userrec *user)
                }
        }
 }
-
-