Merge pull request #1136 from Adam-/insp20+dccallow

[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 e5844532791879fb350fb62a63916c8c7a2e4b47..63bcc38a4180c30526814f66ee6396d433b94ae8 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -153,17 +153,10 @@ class JoinFlood : public ModeHandler
                                                else
                                                {
                                                        // new mode param, replace old with new
-                                                       if ((nsecs > 0) && (njoins > 0))
-                                                       {
-                                                               f = new joinfloodsettings(nsecs, njoins);
-                                                               ext.set(channel, f);
-                                                               channel->SetModeParam('j', parameter);
-                                                               return MODEACTION_ALLOW;
-                                                       }
-                                                       else
-                                                       {
-                                                               return MODEACTION_DENY;
-                                                       }
+                                                       f = new joinfloodsettings(nsecs, njoins);
+                                                       ext.set(channel, f);
+                                                       channel->SetModeParam('j', parameter);
+                                                       return MODEACTION_ALLOW;
                                                }
                                        }
                                }
@@ -176,8 +169,7 @@ class JoinFlood : public ModeHandler
                }
                else
                {
-                       joinfloodsettings* f = ext.get(channel);
-                       if (f)
+                       if (channel->IsModeSet('j'))
                        {
                                ext.unset(channel);
                                channel->SetModeParam('j', "");
@@ -198,12 +190,14 @@ class ModuleJoinFlood : public Module
        ModuleJoinFlood()
                : jf(this)
        {
+       }
 
-               if (!ServerInstance->Modes->AddMode(&jf))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->Extensions.Register(&jf.ext);
+       void init()
+       {
+               ServerInstance->Modules->AddService(jf);
+               ServerInstance->Modules->AddService(jf.ext);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -229,7 +223,7 @@ class ModuleJoinFlood : public Module
                joinfloodsettings *f = jf.ext.get(memb->chan);
 
                /* But all others are OK */
-               if (f)
+               if ((f) && (!f->islocked()))
                {
                        f->addjoin();
                        if (f->shouldlock())