Renamed to chanrec::modes

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

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 7304e6fc271ba8c9134598ffc18afb2998d537c6..5285383cc958d4ba5cf8bc0b0513e602445ec8d4 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
@@ -21,11 +21,6 @@ using namespace std;
 #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>
@@ -38,29 +33,18 @@ using namespace std;
 #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_gline.h"
+#include "cmd_eline.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_gline::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -68,8 +52,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]);
@@ -78,13 +64,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