Now really add +f to <options:chanopsexempt>. Previous add was m_chanfilter (+g).

[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 436e578671a1af4876a95bc8e138c5373e584ec9..6f3beb5125593ac3149bed117baf5c1f0b969498 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <map>
 #include "users.h"
@@ -149,7 +144,7 @@ class MsgFlood : public ModeHandler
                                {
                                        if (!channel->GetExt("flood", f))
                                        {
-                                               parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                               parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
                                                floodsettings *f = new floodsettings(ban,nsecs,nlines);
                                                channel->Extend("flood",f);
                                                channel->SetMode('f', true);
@@ -158,11 +153,11 @@ class MsgFlood : public ModeHandler
                                        }
                                        else
                                        {
-                                               if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)))
+                                               if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
                                                {
                                                        delete f;
                                                        floodsettings *f = new floodsettings(ban,nsecs,nlines);
-                                                       parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                                       parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
                                                        channel->Shrink("flood");
                                                        channel->Extend("flood",f);
                                                        channel->SetModeParam('f', parameter.c_str(), true);
@@ -205,43 +200,48 @@ class ModuleMsgFlood : public Module
        {
                
                mf = new MsgFlood(ServerInstance);
-               ServerInstance->AddMode(mf, 'f');
+               if (!ServerInstance->AddMode(mf, 'f'))
+                       throw ModuleException("Could not add new modes!");
        }
        
        void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
        {
-               if (IS_LOCAL(user))
+               if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
+               {
+                       return;
+               }
+
+               floodsettings *f;
+               if (dest->GetExt("flood", f))
                {
-                       floodsettings *f;
-                       if (dest->GetExt("flood", f))
+                       f->addmessage(user);
+                       if (f->shouldkick(user))
                        {
-                               f->addmessage(user);
-                               if (f->shouldkick(user))
+                               /* Youre outttta here! */
+                               f->clear(user);
+                               if (f->ban)
                                {
-                                       /* Youre outttta here! */
-                                       f->clear(user);
-                                       if (f->ban)
-                                       {
-                                               const char* parameters[3];
-                                               parameters[0] = dest->name;
-                                               parameters[1] = "+b";
-                                               parameters[2] = user->MakeWildHost();
-                                               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,
-                                                * so this event is picked up by our protocol
-                                                * module and formed into a ban command that
-                                                * suits the protocol in use.
-                                                */
-                                               n.push_back(dest->name);
-                                               n.push_back("+b");
-                                               n.push_back(user->MakeWildHost());
-                                               Event rmode((char *)&n, NULL, "send_mode");
-                                               rmode.Send(ServerInstance);
-                                       }
-                                       dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
+                                       const char* parameters[3];
+                                       parameters[0] = dest->name;
+                                       parameters[1] = "+b";
+                                       parameters[2] = user->MakeWildHost();
+                                       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,
+                                        * so this event is picked up by our protocol
+                                        * module and formed into a ban command that
+                                        * suits the protocol in use.
+                                        */
+                                       n.push_back(dest->name);
+                                       n.push_back("+b");
+                                       n.push_back(user->MakeWildHost());
+                                       Event rmode((char *)&n, NULL, "send_mode");
+                                       rmode.Send(ServerInstance);
                                }
+                               char kickmessage[MAXBUF];
+                               snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+                               dest->ServerKickUser(user, kickmessage, true);
                        }
                }
        }