X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=33ba98aa410951b33f69c3e688e19ede82bd5222;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=15cc535c06179609798585c02ca7bb04e5b09658;hpb=7240c926c8e9aeacf95c2bd4803c8879963cca3f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 15cc535c0..33ba98aa4 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -97,7 +97,7 @@ class JoinFlood : public ModeHandler
 			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, Channel* channel)
 	{
@@ -105,7 +105,7 @@ class JoinFlood : public ModeHandler
 		return (their_param < our_param);
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		joinfloodsettings* dummy;
 
@@ -135,7 +135,7 @@ class JoinFlood : public ModeHandler
 				int nsecs = atoi(secs);
 				if ((njoins<1) || (nsecs<1))
 				{
-					source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+					source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
 					parameter.clear();
 					return MODEACTION_DENY;
 				}
@@ -184,7 +184,7 @@ class JoinFlood : public ModeHandler
 			}
 			else
 			{
-				source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+				source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
 				return MODEACTION_DENY;
 			}
 		}
@@ -194,7 +194,7 @@ class JoinFlood : public ModeHandler
 			{
 				joinfloodsettings *f;
 				channel->GetExt("joinflood", f);
-				DELETE(f);
+				delete f;
 				channel->Shrink("joinflood");
 				channel->SetMode('j', false);
 				return MODEACTION_ALLOW;
@@ -206,21 +206,23 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-	
+
 	JoinFlood* jf;
-	
+
  public:
- 
+
 	ModuleJoinFlood(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		jf = new JoinFlood(ServerInstance);
-		if (!ServerInstance->AddMode(jf))
+		if (!ServerInstance->Modes->AddMode(jf))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if (chan)
 		{
@@ -229,7 +231,7 @@ class ModuleJoinFlood : public Module
 			{
 				if (f->islocked())
 				{
-					user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+					user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
 					return 1;
 				}
 			}
@@ -237,9 +239,15 @@ class ModuleJoinFlood : public Module
 		return 0;
 	}
 
-	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		joinfloodsettings *f;
+
+		/* We arent interested in JOIN events caused by a network burst */
+		if (sync)
+			return;
+
+		/* But all others are OK */
 		if (channel->GetExt("joinflood",f))
 		{
 			f->addjoin();
@@ -247,7 +255,7 @@ class ModuleJoinFlood : public Module
 			{
 				f->clear();
 				f->lock();
-				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);
+				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.c_str(), f->joins, f->secs);
 			}
 		}
 	}
@@ -257,25 +265,21 @@ class ModuleJoinFlood : public Module
 		joinfloodsettings *f;
 		if (chan->GetExt("joinflood",f))
 		{
-			DELETE(f);
+			delete f;
 			chan->Shrink("joinflood");
 		}
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
-	}
 
 	virtual ~ModuleJoinFlood()
 	{
 		ServerInstance->Modes->DelMode(jf);
-		DELETE(jf);
+		delete jf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };