Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 c7b5700d235c14e5679ca016f3b5de29e33b7e7f..88092687af1bd791b1ae2816e785bea24c24eb48 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:
@@ -38,8 +38,10 @@ class joinfloodsettings : public classbase
        time_t unlocktime;
        int counter;
        bool locked;
-
+    InspIRCd* ServerInstance;
+    
        joinfloodsettings() : secs(0), joins(0) {};
+
        joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
                reset = time(NULL) + secs;
@@ -92,6 +94,8 @@ class joinfloodsettings : public classbase
 
 };
 
+/** Handles channel mode +j
+ */
 class JoinFlood : public ModeHandler
 {
  public:
@@ -157,6 +161,36 @@ class JoinFlood : public ModeHandler
                                                channel->SetModeParam('j', parameter.c_str(), true);
                                                return MODEACTION_ALLOW;
                                        }
+                                       else
+                                       {
+                                               std::string cur_param = channel->GetModeParameter('j');
+                                               parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
+                                               if (cur_param == parameter)
+                                               {
+                                                       // mode params match
+                                                       return MODEACTION_DENY;
+                                               }
+                                               else
+                                               {
+                                                       // new mode param, replace old with new
+                                                       if ((nsecs > 0) && (njoins > 0))
+                                                       {
+                                                               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);
+                                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                                               return MODEACTION_ALLOW;
+                                                       }
+                                                       else
+                                                       {
+                                                               return MODEACTION_DENY;
+                                                       }
+                                               }
+                                       }
                                }
                        }
                        else
@@ -196,7 +230,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)
                {
@@ -251,7 +285,7 @@ class ModuleJoinFlood : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };