Fix excessive snomask sending on fitler add/removal

[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 1b5612a4a41b950997a2609ce6ccf93fd3b24598..2342870b8e55cde20be5e190cd7d65f99c35bd65 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -130,7 +130,7 @@ class MsgFlood : public ModeHandler
                                /* Set up the flood parameters for this channel */
                                int nlines = atoi(lines);
                                int nsecs = atoi(secs);
-                               if ((nlines<1) || (nsecs<1))
+                               if ((nlines<2) || (nsecs<1))
                                {
                                        source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                        parameter.clear();
@@ -143,8 +143,7 @@ class MsgFlood : public ModeHandler
                                                parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
                                                floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
                                                channel->Extend("flood",fs);
-                                               channel->SetMode('f', true);
-                                               channel->SetModeParam('f', parameter.c_str(), true);
+                                               channel->SetModeParam('f', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -164,8 +163,7 @@ class MsgFlood : public ModeHandler
                                                                floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
                                                                channel->Shrink("flood");
                                                                channel->Extend("flood",fs);
-                                                               channel->SetModeParam('f', cur_param.c_str(), false);
-                                                               channel->SetModeParam('f', parameter.c_str(), true);
+                                                               channel->SetModeParam('f', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -189,7 +187,7 @@ class MsgFlood : public ModeHandler
                        {
                                delete f;
                                channel->Shrink("flood");
-                               channel->SetMode('f', false);
+                               channel->SetModeParam('f', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -245,7 +243,7 @@ class ModuleMsgFlood : public Module
                                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, true))
+                               if (!dest->ServerKickUser(user, kickmessage))
                                {
                                        delete dest;
                                }