X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=012c95a8e8cfe89972c6c58df9e9beb0c419558b;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=52174792f53f45cc0ffb29e7f0e2a7c4a55780ee;hpb=b45e7cfebbeaad4ecc3c55bc3060140f50f710d3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 52174792f..012c95a8e 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <map>
 #include "users.h"
@@ -149,7 +144,7 @@ class MsgFlood : public ModeHandler
 				{
 					if (!channel->GetExt("flood", f))
 					{
-						parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+						parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
 						floodsettings *f = new floodsettings(ban,nsecs,nlines);
 						channel->Extend("flood",f);
 						channel->SetMode('f', true);
@@ -158,11 +153,11 @@ class MsgFlood : public ModeHandler
 					}
 					else
 					{
-						if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)))
+						if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
 						{
 							delete f;
 							floodsettings *f = new floodsettings(ban,nsecs,nlines);
-							parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+							parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
 							channel->Shrink("flood");
 							channel->Extend("flood",f);
 							channel->SetModeParam('f', parameter.c_str(), true);
@@ -205,7 +200,8 @@ class ModuleMsgFlood : public Module
 	{
 		
 		mf = new MsgFlood(ServerInstance);
-		ServerInstance->AddMode(mf, 'f');
+		if (!ServerInstance->AddMode(mf, 'f'))
+			throw ModuleException("Could not add new modes!");
 	}
 	
 	void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
@@ -240,13 +236,15 @@ class ModuleMsgFlood : public Module
 						Event rmode((char *)&n, NULL, "send_mode");
 						rmode.Send(ServerInstance);
 					}
-					dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
+					char kickmessage[MAXBUF];
+					snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+					dest->ServerKickUser(user, kickmessage, true);
 				}
 			}
 		}
 	}
 
-	virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status)
+	virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
@@ -254,7 +252,7 @@ class ModuleMsgFlood : public Module
 		}
 	}
 
-	virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status)
+	virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
@@ -285,7 +283,7 @@ class ModuleMsgFlood : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };