Initialize loopCall on construction

[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 c374c5346b0cd075aa550b408ca91d1b0875f756..f2082da3338c27a23a7c12ecf729aaece1fde295 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.
@@ -19,6 +19,8 @@
  */
 class floodsettings : public classbase
 {
+ private:
+       InspIRCd *ServerInstance;
  public:
        bool ban;
        int secs;
@@ -26,10 +28,9 @@ class floodsettings : public classbase
        time_t reset;
        std::map<User*,int> counters;
 
-       floodsettings() : ban(0), secs(0), lines(0) {};
-       floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
+       floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c)
        {
-               reset = time(NULL) + secs;
+               reset = ServerInstance->Time() + secs;
        };
 
        void addmessage(User* who)
@@ -43,10 +44,10 @@ class floodsettings : public classbase
                {
                        counters[who] = 1;
                }
-               if (time(NULL) > reset)
+               if (ServerInstance->Time() > reset)
                {
                        counters.clear();
-                       reset = time(NULL) + secs;
+                       reset = ServerInstance->Time() + secs;
                }
        }
 
@@ -129,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();
@@ -140,10 +141,9 @@ class MsgFlood : public ModeHandler
                                        if (!channel->GetExt("flood", f))
                                        {
                                                parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-                                               floodsettings *fs = new floodsettings(ban,nsecs,nlines);
+                                               floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
                                                channel->Extend("flood",fs);
-                                               channel->SetMode('f', true);
-                                               channel->SetModeParam('f', parameter.c_str(), true);
+                                               channel->SetMode('f', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -160,11 +160,10 @@ class MsgFlood : public ModeHandler
                                                        if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0))))
                                                        {
                                                                delete f;
-                                                               floodsettings *fs = new floodsettings(ban,nsecs,nlines);
+                                                               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->SetMode('f', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -188,7 +187,7 @@ class MsgFlood : public ModeHandler
                        {
                                delete f;
                                channel->Shrink("flood");
-                               channel->SetMode('f', false);
+                               channel->SetMode('f', "");
                                return MODEACTION_ALLOW;
                        }
                }