Because these modes take no parameter when being removed, they need no special code...

[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 3f3c44d98912c08df007d80aa31c30c4d9820d80..c7b5700d235c14e5679ca016f3b5de29e33b7e7f 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -21,11 +21,13 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
+
+
 class joinfloodsettings : public classbase
 {
  public:
@@ -43,16 +45,13 @@ class joinfloodsettings : public classbase
                reset = time(NULL) + secs;
                counter = 0;
                locked = false;
-               log(DEBUG,"Create new joinfloodsettings: %lu %lu",time(NULL),reset);
        };
 
        void addjoin()
        {
                counter++;
-               log(DEBUG,"joinflood counter is %d",counter);
                if (time(NULL) > reset)
                {
-                       log(DEBUG,"joinflood counter reset");
                        counter = 0;
                        reset = time(NULL) + secs;
                }
@@ -65,7 +64,6 @@ class joinfloodsettings : public classbase
 
        void clear()
        {
-               log(DEBUG,"joinflood counter clear");
                counter = 0;
        }
 
@@ -88,7 +86,6 @@ class joinfloodsettings : public classbase
 
        void lock()
        {
-               log(DEBUG,"joinflood lock");
                locked = true;
                unlocktime = time(NULL) + 60;
        }
@@ -98,7 +95,7 @@ class joinfloodsettings : public classbase
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood() : ModeHandler('j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
         ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
         {
@@ -121,6 +118,7 @@ class JoinFlood : public ModeHandler
 
                if (adding)
                {
+                       ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
                        char ndata[MAXBUF];
                        char* data = ndata;
                        strlcpy(ndata,parameter.c_str(),MAXBUF);
@@ -185,17 +183,17 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       Server *Srv;
+       
        JoinFlood* jf;
        
  public:
  
-       ModuleJoinFlood(Server* Me)
+       ModuleJoinFlood(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               jf = new JoinFlood();
-               Srv->AddMode(jf, 'j');
+               
+               jf = new JoinFlood(ServerInstance);
+               ServerInstance->AddMode(jf, 'j');
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -225,7 +223,7 @@ class ModuleJoinFlood : public Module
                        {
                                f->clear();
                                f->lock();
-                               channel->WriteChannelWithServ((char*)Srv->GetServerName().c_str(), "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
+                               channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
                        }
                }
        }
@@ -242,22 +240,18 @@ class ModuleJoinFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "j", 3);
+               List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
        }
 
        virtual ~ModuleJoinFlood()
        {
+               ServerInstance->Modes->DelMode(jf);
                DELETE(jf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };
 
@@ -273,7 +267,7 @@ class ModuleJoinFloodFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleJoinFlood(Me);
        }