X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=edce2b22cb6310236f5fcddb1911a0113f00c761;hb=c77cc4f737c782c3a56d69da0eac82edd41d4976;hp=fde974559bbb68f1820f5669c8d8e7fc054ae675;hpb=01a796e239d23064f428698d36aa5f27efb5454b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index fde974559..edce2b22c 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -23,8 +23,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel mode +j (join flood protection) */
-
 /** Holds settings and state associated with channel mode +j
  */
 class joinfloodsettings
@@ -98,7 +96,7 @@ class JoinFlood : public ModeHandler
 			std::string::size_type colon = parameter.find(':');
 			if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
 			{
-				source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+				source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
 				return MODEACTION_DENY;
 			}
 
@@ -107,7 +105,7 @@ class JoinFlood : public ModeHandler
 			unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
 			if ((njoins<1) || (nsecs<1))
 			{
-				source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+				source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
 				return MODEACTION_DENY;
 			}
 
@@ -119,7 +117,6 @@ class JoinFlood : public ModeHandler
 
 			ext.set(channel, jfs);
 			parameter = ConvToStr(njoins) + ":" + ConvToStr(nsecs);
-			channel->SetModeParam(this, parameter);
 			return MODEACTION_ALLOW;
 		}
 		else
@@ -127,13 +124,8 @@ class JoinFlood : public ModeHandler
 			if (!channel->IsModeSet(this))
 				return MODEACTION_DENY;
 
-			joinfloodsettings* f = ext.get(channel);
-			if (f)
-			{
-				ext.unset(channel);
-				channel->SetModeParam(this, "");
-				return MODEACTION_ALLOW;
-			}
+			ext.unset(channel);
+			return MODEACTION_ALLOW;
 		}
 		return MODEACTION_DENY;
 	}
@@ -149,14 +141,6 @@ class ModuleJoinFlood : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(jf);
-		ServerInstance->Modules->AddService(jf.ext);
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
@@ -164,7 +148,7 @@ class ModuleJoinFlood : public Module
 			joinfloodsettings *f = jf.ext.get(chan);
 			if (f && f->islocked())
 			{
-				user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+				user->WriteNumeric(609, "%s :This channel is temporarily unavailable (+j). Please try again later.",chan->name.c_str());
 				return MOD_RES_DENY;
 			}
 		}
@@ -180,7 +164,7 @@ class ModuleJoinFlood : public Module
 		joinfloodsettings *f = jf.ext.get(memb->chan);
 
 		/* But all others are OK */
-		if (f)
+		if ((f) && (!f->islocked()))
 		{
 			f->addjoin();
 			if (f->shouldlock())