All modules which implement simplemodes (no parameters, not a list mode) can now...

[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 79ab10eef7e24e83ee4f391aae87b1be207a9af5..3eccb868d1c10fb66c83babf8714cb3fe138ff9f 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -21,12 +21,11 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
-extern InspIRCd* ServerInstance;
+
 
 class floodsettings : public classbase
 {
@@ -41,7 +40,6 @@ class floodsettings : public classbase
        floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
        {
                reset = time(NULL) + secs;
-               log(DEBUG,"Create new floodsettings: %lu %lu",time(NULL),reset);
        };
 
        void addmessage(userrec* who)
@@ -50,16 +48,13 @@ class floodsettings : public classbase
                if (iter != counters.end())
                {
                        iter->second++;
-                       log(DEBUG,"Count for %s is now %d",who->nick,iter->second);
                }
                else
                {
                        counters[who] = 1;
-                       log(DEBUG,"Count for %s is now *1*",who->nick);
                }
                if (time(NULL) > reset)
                {
-                       log(DEBUG,"floodsettings timer Resetting.");
                        counters.clear();
                        reset = time(NULL) + secs;
                }
@@ -70,7 +65,6 @@ class floodsettings : public classbase
                std::map<userrec*,int>::iterator iter = counters.find(who);
                if (iter != counters.end())
                {
-                       log(DEBUG,"should kick? %d, %d",iter->second,this->lines);
                        return (iter->second >= this->lines);
                }
                else return false;
@@ -186,7 +180,7 @@ class MsgFlood : public ModeHandler
 
 class ModuleMsgFlood : public Module
 {
-       Server *Srv;
+       
        MsgFlood* mf;
        
  public:
@@ -196,7 +190,7 @@ class ModuleMsgFlood : public Module
        {
                
                mf = new MsgFlood(ServerInstance);
-               Srv->AddMode(mf, 'f');
+               ServerInstance->AddMode(mf, 'f');
        }
        
        void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
@@ -217,7 +211,7 @@ class ModuleMsgFlood : public Module
                                                parameters[0] = dest->name;
                                                parameters[1] = "+b";
                                                parameters[2] = user->MakeWildHost();
-                                               Srv->SendMode(parameters,3,user);
+                                               ServerInstance->SendMode(parameters,3,user);
                                                std::deque<std::string> n;
                                                /* Propogate the ban to other servers.
                                                 * We dont know what protocol we may be using,
@@ -229,7 +223,7 @@ class ModuleMsgFlood : public Module
                                                n.push_back("+b");
                                                n.push_back(user->MakeWildHost());
                                                Event rmode((char *)&n, NULL, "send_mode");
-                                               rmode.Send();
+                                               rmode.Send(ServerInstance);
                                        }
                                        dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
                                }
@@ -265,12 +259,7 @@ class ModuleMsgFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output, "f", 3);
+               List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
        }
 
        virtual ~ModuleMsgFlood()