X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=21b432222fe81de7e7d58f5a8e53045c81ddfebf;hb=be609949e3ec2543d6cb16d23240870028732f36;hp=5c7c0a9773bff1dcaa6e7e5170f8453a30f2ec8c;hpb=d7c6f213ec42585507a12b305a69a0f0740d8caa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 5c7c0a977..21b432222 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -131,7 +131,7 @@ class MsgFlood : public ModeHandler
 				int nsecs = atoi(secs);
 				if ((nlines<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;
 				}
@@ -157,7 +157,7 @@ class MsgFlood : public ModeHandler
 						}
 						else
 						{
-							if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+							if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0))))
 							{
 								delete f;
 								floodsettings *fs = new floodsettings(ban,nsecs,nlines);
@@ -177,7 +177,7 @@ class MsgFlood : 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());
 				parameter.clear();
 				return MODEACTION_DENY;
 			}
@@ -192,32 +192,32 @@ class MsgFlood : public ModeHandler
 				return MODEACTION_ALLOW;
 			}
 		}
-		
+
 		return MODEACTION_DENY;
 	}
 };
 
 class ModuleMsgFlood : public Module
 {
-	
+
 	MsgFlood* mf;
-	
+
  public:
- 
+
 	ModuleMsgFlood(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		mf = new MsgFlood(ServerInstance);
 		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);
 	}
-	
+
 	int ProcessMessages(User* user,Channel* dest, const std::string &text)
 	{
-		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
+		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP))
 		{
 			return 0;
 		}
@@ -232,24 +232,27 @@ 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::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->SendMode(dest->name, std::string("+b ") + user->MakeWildHost());
+					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;
 			}
 		}
-		
+
 		return 0;
 	}
 
@@ -257,7 +260,7 @@ class ModuleMsgFlood : public Module
 	{
 		if (target_type == TYPE_CHANNEL)
 			return ProcessMessages(user,(Channel*)dest,text);
-		
+
 		return 0;
 	}
 
@@ -265,7 +268,7 @@ class ModuleMsgFlood : public Module
 	{
 		if (target_type == TYPE_CHANNEL)
 			return ProcessMessages(user,(Channel*)dest,text);
-			
+
 		return 0;
 	}
 
@@ -285,10 +288,10 @@ class ModuleMsgFlood : public Module
 		ServerInstance->Modes->DelMode(mf);
 		delete mf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };