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

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7021 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 4a3fa3dcaae227bc9677f4a22bce29517a71ca02..87b2105b5ecdf07eba3f8ecf311f8c210529b50a 100644 (file)
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -909,7 +909,7 @@
          quietbursts="yes"
          pingwarning="15"
          allowhalfop="yes"
-        exemptchanops="Scf">
+        exemptchanops="Scfg">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#- TIME SYNC OPTIONS -#-#-#-#-#-#-#-#-#-#-#-#
 # Time sychronization options for m_spanningtree linking.             #

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 012c95a8e8cfe89972c6c58df9e9beb0c419558b..6f3beb5125593ac3149bed117baf5c1f0b969498 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -206,40 +206,42 @@ class ModuleMsgFlood : public Module
        
        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)
                {
-                       floodsettings *f;
-                       if (dest->GetExt("flood", f))
+                       return;
+               }
+
+               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);
-                                       }
-                                       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);
+                                       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);
                        }
                }
        }