X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=25350b15b006b6445b285d0b693bb4c550b55303;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=c49b2122bc3d805c58356c3323d63e71149f0a75;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index c49b2122b..25350b15b 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.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
@@ -92,7 +92,7 @@ class MsgFlood : 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)
 	{
 		floodsettings *f;
 
@@ -131,7 +131,7 @@ class MsgFlood : public ModeHandler
 				int nsecs = atoi(secs);
 				if ((nlines<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,channel->name);
 					parameter.clear();
 					return MODEACTION_DENY;
 				}
@@ -140,8 +140,8 @@ class MsgFlood : public ModeHandler
 					if (!channel->GetExt("flood", f))
 					{
 						parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-						floodsettings *f = new floodsettings(ban,nsecs,nlines);
-						channel->Extend("flood",f);
+						floodsettings *fs = new floodsettings(ban,nsecs,nlines);
+						channel->Extend("flood",fs);
 						channel->SetMode('f', true);
 						channel->SetModeParam('f', parameter.c_str(), true);
 						return MODEACTION_ALLOW;
@@ -160,9 +160,9 @@ class MsgFlood : public ModeHandler
 							if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
 							{
 								delete f;
-								floodsettings *f = new floodsettings(ban,nsecs,nlines);
+								floodsettings *fs = new floodsettings(ban,nsecs,nlines);
 								channel->Shrink("flood");
-								channel->Extend("flood",f);
+								channel->Extend("flood",fs);
 								channel->SetModeParam('f', cur_param.c_str(), false);
 								channel->SetModeParam('f', parameter.c_str(), true);
 								return MODEACTION_ALLOW;
@@ -177,7 +177,7 @@ class MsgFlood : 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,channel->name);
 				parameter.clear();
 				return MODEACTION_DENY;
 			}
@@ -209,7 +209,7 @@ class ModuleMsgFlood : public Module
 	{
 		
 		mf = new MsgFlood(ServerInstance);
-		if (!ServerInstance->AddMode(mf))
+		if (!ServerInstance->Modes->AddMode(mf))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNotice, I_OnUserPreMessage };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
@@ -232,31 +232,24 @@ class ModuleMsgFlood : public Module
 				f->clear(user);
 				if (f->ban)
 				{
-					const char* parameters[3];
-					parameters[0] = dest->name;
-					parameters[1] = "+b";
-					parameters[2] = user->MakeWildHost();
-					ServerInstance->SendMode(parameters,3,user);
-					std::deque<std::string> n;
-					/* Propogate the ban to other servers.
-					 * We dont know what protocol we may be using,
-					 * so this event is picked up by our protocol
-					 * module and formed into a ban command that
-					 * suits the protocol in use.
-					 */
-					n.push_back(dest->name);
-					n.push_back("+b");
-					n.push_back(user->MakeWildHost());
-					Event rmode((char *)&n, NULL, "send_mode");
-					rmode.Send(ServerInstance);
+					std::vector<std::string> parameters(3);
+					parameters.push_back(dest->name);
+					parameters.push_back("+b");
+					parameters.push_back(user->MakeWildHost());
+					ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+
+					ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost());
 				}
+
 				char kickmessage[MAXBUF];
 				snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+
 				if (!dest->ServerKickUser(user, kickmessage, true))
 				{
 					delete dest;
-					return 1;
 				}
+
+				return 1;
 			}
 		}
 		
@@ -298,7 +291,7 @@ class ModuleMsgFlood : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };