X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=c7b5700d235c14e5679ca016f3b5de29e33b7e7f;hb=e7c31868d1787071a063c31eae0a8de5389a9419;hp=34d39c8b603b1bb6b5d50b82a2687e6a0417f7a4;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 34d39c8b6..c7b5700d2 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -21,7 +21,6 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "configreader.h"
 #include "inspircd.h"
 
@@ -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;
 	}
@@ -124,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);
@@ -245,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)
-	{
-		ServerInstance->ModeGrok->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);
 	}
 };