All done.

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 391f13b24c112063bbe5155ef9f2e10e670a523d..c1c50f2d480cac307f0388f8a39e791b7a80d2e4 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -26,8 +26,8 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
-
-
+/** Holds settings and state associated with channel mode +j
+ */
 class joinfloodsettings : public classbase
 {
  public:
@@ -40,6 +40,7 @@ class joinfloodsettings : public classbase
        bool locked;
 
        joinfloodsettings() : secs(0), joins(0) {};
+
        joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
                reset = time(NULL) + secs;
@@ -92,6 +93,8 @@ class joinfloodsettings : public classbase
 
 };
 
+/** Handles channel mode +j
+ */
 class JoinFlood : public ModeHandler
 {
  public:
@@ -169,9 +172,12 @@ class JoinFlood : public ModeHandler
                                                else
                                                {
                                                        // new mode param, replace old with new
-                                                       if ((!nsecs) && (!njoins))
+                                                       if ((nsecs > 0) && (njoins > 0))
                                                        {
-                                                               joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
+                                                               joinfloodsettings* f;
+                                                               channel->GetExt("joinflood", f);
+                                                               delete f;
+                                                               f = new joinfloodsettings(nsecs,njoins);
                                                                channel->Shrink("joinflood");
                                                                channel->Extend("joinflood", f);
                                                                channel->SetModeParam('j', cur_param.c_str(), false);
@@ -223,7 +229,7 @@ class ModuleJoinFlood : public Module
                ServerInstance->AddMode(jf, 'j');
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {