Fix some of the include guard names (requested by SaberUK)

[user/henk/code/inspircd.git] / src / modules / m_messageflood.cpp

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 9bc0f362fb77d120d8291d1c3124d9f93e050361..ccaf0a402763ff1f9e6a23defadf437ccb812c24 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,10 +17,8 @@
 
 /** Holds flood settings and state for mode +f
  */
-class floodsettings : public classbase
+class floodsettings
 {
- private:
-       InspIRCd *ServerInstance;
  public:
        bool ban;
        int secs;
@@ -80,15 +78,6 @@ class MsgFlood : public ModeHandler
        MsgFlood(Module* Creator) : ModeHandler(Creator, "flood", 'f', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("messageflood", Creator) { }
 
-       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-       {
-               floodsettings* x = ext.get(channel);
-               if (x)
-                       return std::make_pair(true, (x->ban ? "*" : "")+ConvToStr(x->lines)+":"+ConvToStr(x->secs));
-               else
-                       return std::make_pair(false, parameter);
-       }
-
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                floodsettings *f = ext.get(channel);
@@ -207,8 +196,7 @@ class ModuleMsgFlood : public Module
 
        ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
        {
-               ModResult res;
-               FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,dest,"flood"));
+               ModResult res = ServerInstance->OnCheckExemption(user,dest,"flood");
                if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
 
@@ -226,15 +214,13 @@ class ModuleMsgFlood : public Module
                                        parameters.push_back(dest->name);
                                        parameters.push_back("+b");
                                        parameters.push_back(user->MakeWildHost());
-                                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
-
-                                       ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost());
+                                       ServerInstance->SendGlobalMode(parameters, ServerInstance->FakeClient);
                                }
 
                                char kickmessage[MAXBUF];
                                snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
 
-                               dest->ServerKickUser(user, kickmessage);
+                               dest->KickUser(ServerInstance->FakeClient, user, kickmessage);
 
                                return MOD_RES_DENY;
                        }
@@ -265,7 +251,7 @@ class ModuleMsgFlood : public Module
 
        Version GetVersion()
        {
-               return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR);
+               return Version("Provides channel mode +f (message flood protection)", VF_VENDOR);
        }
 };