X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=3d342b636357f3efd72bb29ed750fff8de765c81;hb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;hp=983090d09af96d2718b7898e0b18c6c2953d443f;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 983090d09..3d342b636 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -11,13 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <map>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
@@ -33,8 +30,8 @@ class joinfloodsettings : public classbase
 	time_t unlocktime;
 	int counter;
 	bool locked;
-    InspIRCd* ServerInstance;
-    
+	InspIRCd* ServerInstance;
+
 	joinfloodsettings() : secs(0), joins(0) {};
 
 	joinfloodsettings(int b, int c) : secs(b), joins(c)
@@ -96,16 +93,16 @@ class JoinFlood : public ModeHandler
  public:
 	JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                joinfloodsettings* x;
-                if (channel->GetExt("joinflood",x))
-                        return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
-                else
-                        return std::make_pair(false, parameter);
-        } 
+	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	{
+		joinfloodsettings* x;
+		if (channel->GetExt("joinflood",x))
+			return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
+		else
+			return std::make_pair(false, parameter);
+	} 
 
-        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
@@ -117,7 +114,6 @@ 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);
@@ -135,6 +131,7 @@ class JoinFlood : public ModeHandler
 				else data++;
 			}
 			if (secs)
+
 			{
 				/* Set up the flood parameters for this channel */
 				int njoins = atoi(joins);
@@ -142,7 +139,7 @@ class JoinFlood : public ModeHandler
 				if ((njoins<1) || (nsecs<1))
 				{
 					source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
-					parameter = "";
+					parameter.clear();
 					return MODEACTION_DENY;
 				}
 				else
@@ -218,11 +215,12 @@ class ModuleJoinFlood : public Module
  public:
  
 	ModuleJoinFlood(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		jf = new JoinFlood(ServerInstance);
-		ServerInstance->AddMode(jf, 'j');
+		if (!ServerInstance->AddMode(jf, 'j'))
+			throw ModuleException("Could not add new modes!");
 	}
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -242,7 +240,7 @@ class ModuleJoinFlood : public Module
 		return 0;
 	}
 
-	virtual void OnUserJoin(userrec* user, chanrec* channel)
+	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
 	{
 		joinfloodsettings *f;
 		if (channel->GetExt("joinflood",f))
@@ -284,28 +282,4 @@ class ModuleJoinFlood : public Module
 	}
 };
 
-
-class ModuleJoinFloodFactory : public ModuleFactory
-{
- public:
-	ModuleJoinFloodFactory()
-	{
-	}
-	
-	~ModuleJoinFloodFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleJoinFlood(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleJoinFloodFactory;
-}
-
+MODULE_INIT(ModuleJoinFlood)