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 7d0f594818ae72eb26ec70075a05631ac805e739..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;
@@ -28,7 +26,7 @@ class floodsettings : public classbase
        time_t reset;
        std::map<User*,int> counters;
 
-       floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c)
+       floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
        {
                reset = ServerInstance->Time() + secs;
        };
@@ -77,18 +75,9 @@ class MsgFlood : public ModeHandler
 {
  public:
        SimpleExtItem<floodsettings> ext;
-       MsgFlood(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'f', 1, 0, false, MODETYPE_CHANNEL, false),
+       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);
@@ -137,7 +126,7 @@ class MsgFlood : public ModeHandler
                                        if (!f)
                                        {
                                                parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-                                               f = new floodsettings(ServerInstance,ban,nsecs,nlines);
+                                               f = new floodsettings(ban,nsecs,nlines);
                                                ext.set(channel, f);
                                                channel->SetModeParam('f', parameter);
                                                return MODEACTION_ALLOW;
@@ -155,7 +144,7 @@ class MsgFlood : public ModeHandler
                                                {
                                                        if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0))))
                                                        {
-                                                               floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
+                                                               floodsettings *fs = new floodsettings(ban,nsecs,nlines);
                                                                ext.set(channel, fs);
                                                                channel->SetModeParam('f', parameter);
                                                                return MODEACTION_ALLOW;
@@ -195,22 +184,21 @@ class ModuleMsgFlood : public Module
 
  public:
 
-       ModuleMsgFlood(InspIRCd* Me)
-               : Module(Me), mf(Me, this)
+       ModuleMsgFlood()
+               : mf(this)
        {
                if (!ServerInstance->Modes->AddMode(&mf))
                        throw ModuleException("Could not add new modes!");
-               Extensible::Register(&mf.ext);
+               ServerInstance->Extensions.Register(&mf.ext);
                Implementation eventlist[] = { I_OnUserPreNotice, I_OnUserPreMessage };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
        {
-               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP))
-               {
+               ModResult res = ServerInstance->OnCheckExemption(user,dest,"flood");
+               if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
-               }
 
                floodsettings *f = mf.ext.get(dest);
                if (f)
@@ -226,18 +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);
 
-                               if (!dest->ServerKickUser(user, kickmessage))
-                               {
-                                       delete dest;
-                               }
+                               dest->KickUser(ServerInstance->FakeClient, user, kickmessage);
 
                                return MOD_RES_DENY;
                        }
@@ -264,12 +247,11 @@ class ModuleMsgFlood : public Module
 
        ~ModuleMsgFlood()
        {
-               ServerInstance->Modes->DelMode(&mf);
        }
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +f (message flood protection)", VF_VENDOR);
        }
 };