Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[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 7603e36d50a841ad72b5e7b03ff8e7bcf484d395..83feb2e5962044ada836e74923850b6d7dedc5a7 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -21,13 +21,12 @@ 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) */
 
-extern InspIRCd* ServerInstance;
+
 
 class joinfloodsettings : public classbase
 {
@@ -46,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;
                }
@@ -68,7 +64,6 @@ class joinfloodsettings : public classbase
 
        void clear()
        {
-               log(DEBUG,"joinflood counter clear");
                counter = 0;
        }
 
@@ -91,7 +86,6 @@ class joinfloodsettings : public classbase
 
        void lock()
        {
-               log(DEBUG,"joinflood lock");
                locked = true;
                unlocktime = time(NULL) + 60;
        }
@@ -188,7 +182,7 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       Server *Srv;
+       
        JoinFlood* jf;
        
  public:
@@ -198,7 +192,7 @@ class ModuleJoinFlood : public Module
        {
                
                jf = new JoinFlood(ServerInstance);
-               Srv->AddMode(jf, 'j');
+               ServerInstance->AddMode(jf, 'j');
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -245,12 +239,7 @@ 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)
-       {
-               ServerInstance->ModeGrok->InsertMode(output, "j", 3);
+               List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
        }
 
        virtual ~ModuleJoinFlood()