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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 5f8c329cc..33ba98aa4 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -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)
 	{
@@ -135,7 +135,7 @@ class JoinFlood : public ModeHandler
 				int nsecs = atoi(secs);
 				if ((njoins<1) || (nsecs<1))
 				{
-					source->WriteNumeric(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->WriteNumeric(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;
 			}
 		}
@@ -206,23 +206,23 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-	
+
 	JoinFlood* jf;
-	
+
  public:
- 
+
 	ModuleJoinFlood(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		jf = new JoinFlood(ServerInstance);
 		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)
 		{
@@ -231,7 +231,7 @@ class ModuleJoinFlood : public Module
 			{
 				if (f->islocked())
 				{
-					user->WriteNumeric(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;
 				}
 			}
@@ -255,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);
 			}
 		}
 	}
@@ -276,10 +276,10 @@ class ModuleJoinFlood : public Module
 		ServerInstance->Modes->DelMode(jf);
 		delete jf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };