Find the right variable so it actually works, too.

[user/henk/code/inspircd.git] / src / modules / m_nickflood.cpp

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index e281713c3c45ae631f24b9a74b1511992905ec7e..97055c225b8561424b5dbee76666ac0fefd1fc53 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.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.
@@ -48,7 +48,11 @@ class nickfloodsettings : public classbase
 
        bool shouldlock()
        {
-               return (counter >= this->nicks);
+               /* XXX HACK: using counter + 1 here now to allow the counter to only be incremented
+                * on successful nick changes; this will be checked before the counter is
+                * incremented.
+                */
+               return (counter + 1 >= this->nicks);
        }
 
        void clear()
@@ -144,8 +148,7 @@ class NickFlood : public ModeHandler
                                                parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs);
                                                nickfloodsettings *f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
                                                channel->Extend("nickflood", f);
-                                               channel->SetMode('F', true);
-                                               channel->SetModeParam('F', parameter.c_str(), true);
+                                               channel->SetModeParam('F', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -168,8 +171,7 @@ class NickFlood : public ModeHandler
                                                                f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
                                                                channel->Shrink("nickflood");
                                                                channel->Extend("nickflood", f);
-                                                               channel->SetModeParam('F', cur_param.c_str(), false);
-                                                               channel->SetModeParam('F', parameter.c_str(), true);
+                                                               channel->SetModeParam('F', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -194,7 +196,7 @@ class NickFlood : public ModeHandler
                                channel->GetExt("nickflood", f);
                                delete f;
                                channel->Shrink("nickflood");
-                               channel->SetMode('F', false);
+                               channel->SetModeParam('F', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -215,8 +217,8 @@ class ModuleNickFlood : public Module
                jf = new NickFlood(ServerInstance);
                if (!ServerInstance->Modes->AddMode(jf))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick, I_OnUserPostNick };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual int OnUserPreNick(User* user, const std::string &newnick)
@@ -240,7 +242,6 @@ class ModuleNickFlood : public Module
                                        return 1;
                                }
 
-                               f->addnick();
                                if (f->shouldlock())
                                {
                                        f->clear();
@@ -254,6 +255,34 @@ class ModuleNickFlood : public Module
                return 0;
        }
 
+       /*
+        * XXX: HACK: We do the increment on the *POST* event here (instead of all together) because we have no way of knowing whether other modules would block a nickchange.
+        */
+       virtual void OnUserPostNick(User* user, const std::string &oldnick)
+       {
+               if (isdigit(user->nick[0])) /* allow switches to UID */
+                       return;
+
+               for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+               {
+                       Channel *channel = i->first;
+
+                       nickfloodsettings *f;
+                       if (channel->GetExt("nickflood", f))
+                       {
+                               if (CHANOPS_EXEMPT(ServerInstance, 'F') && channel->GetStatus(user) == STATUS_OP)
+                                       return;
+                               
+                               /* moved this here to avoid incrementing the counter for nick
+                                * changes that are denied for some other reason (bans, +N, etc.)
+                                * per bug #874.
+                                */
+                               f->addnick();
+                       }
+               }
+               return;
+       }
+
        void OnChannelDelete(Channel* chan)
        {
                nickfloodsettings *f;