delete operator tracking in debug mode (using a macro -- live with it.)

[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 bbc4eb043b46446cc66388472af1a65813aa115e..c5df268ea896ad5953ee90b09cd46d60350d5ce9 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -144,7 +144,7 @@ class ModuleMsgFlood : public Module
                                        {
                                                if (!c->GetExt("flood"))
                                                {
-                                                       floodsettings *f = new floodsettings(ban,nlines,nsecs);
+                                                       floodsettings *f = new floodsettings(ban,nsecs,nlines);
                                                        c->Extend("flood",(char*)f);
                                                }
                                        }
@@ -163,7 +163,7 @@ class ModuleMsgFlood : public Module
                                if (c->GetExt("flood"))
                                {
                                        floodsettings *f = (floodsettings*)c->GetExt("flood");
-                                       delete f;
+                                       DELETE(f);
                                        c->Shrink("flood");
                                }
                        }
@@ -172,38 +172,41 @@ class ModuleMsgFlood : public Module
                return 0;
        }
 
-       int ProcessMessages(userrec* user,chanrec* dest,std::string &text)
+       void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
        {
-               floodsettings *f = (floodsettings*)dest->GetExt("flood");
-               if (f)
+               if (IS_LOCAL(user))
                {
-                       f->addmessage(user);
-                       if (f->shouldkick(user))
+                       floodsettings *f = (floodsettings*)dest->GetExt("flood");
+                       if (f)
                        {
-                               /* Youre outttta here! */
-                               f->clear(user);
-                               if (f->ban)
+                               f->addmessage(user);
+                               if (f->shouldkick(user))
                                {
-                                       char* parameters[3];
-                                       parameters[0] = dest->name;
-                                       parameters[1] = "+b";
-                                       parameters[2] = user->MakeWildHost();
-                                       Srv->SendMode(parameters,3,user);
+                                       /* Youre outttta here! */
+                                       f->clear(user);
+                                       if (f->ban)
+                                       {
+                                               char* parameters[3];
+                                               parameters[0] = dest->name;
+                                               parameters[1] = "+b";
+                                               parameters[2] = user->MakeWildHost();
+                                               Srv->SendMode(parameters,3,user);
+                                       }
+                                       Srv->KickUser(NULL, user, dest, "Channel flood triggered (mode +f)");
                                }
-                               Srv->KickUser(NULL, user, dest, "Channel flood triggered (mode +f)");
                        }
                }
        }
 
-        virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text);
+       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status)
        {
-                if (target_type == TYPE_CHANNEL)
-                {
-                        ProcessMessages(user,(chanrec*)dest,text);
-                }
+               if (target_type == TYPE_CHANNEL)
+               {
+                       ProcessMessages(user,(chanrec*)dest,text);
+               }
        }
 
-       virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text)
+       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -216,7 +219,7 @@ class ModuleMsgFlood : public Module
                if (chan->GetExt("flood"))
                {
                        floodsettings *f = (floodsettings*)chan->GetExt("flood");
-                       delete f;
+                       DELETE(f);
                        chan->Shrink("flood");
                }
        }
@@ -226,25 +229,10 @@ class ModuleMsgFlood : public Module
                List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                               // By doing this we're *assuming* no other module has fucked up the CHANMODES=
-                               // section of the 005 numeric. If they have, we're going DOWN in a blaze of glory,
-                               // with a honking great EXCEPTION :)
-                               temp1.insert(temp1.find(",")+1,"f");
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
+       virtual void On005Numeric(std::string &output)
+       {
+               InsertMode(output, "f", 3);
+       }
 
        virtual ~ModuleMsgFlood()
        {