m_messageflood Improve kick message

[user/henk/code/inspircd.git] / src / modules / m_messageflood.cpp

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 1faf3bfb99e5a1d04c449b9798201088f72edb6d..7323605cb0203c65435d28f6022eb6f08a1ef558 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -73,7 +73,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
                std::string::size_type colon = parameter.find(':');
                if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
                {
-                       source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
+                       source->WriteNumeric(608, channel->name, "Invalid flood parameter");
                        return MODEACTION_DENY;
                }
 
@@ -84,7 +84,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
 
                if ((nlines<2) || (nsecs<1))
                {
-                       source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
+                       source->WriteNumeric(608, channel->name, "Invalid flood parameter");
                        return MODEACTION_DENY;
                }
 
@@ -138,8 +138,8 @@ class ModuleMsgFlood : public Module
                                        ServerInstance->Modes->Process(ServerInstance->FakeClient, dest, NULL, changelist);
                                }
 
-                               const std::string kickMessage = "Channel flood triggered (limit is " + ConvToStr(f->lines) +
-                                       " in " + ConvToStr(f->secs) + " secs)";
+                               const std::string kickMessage = "Channel flood triggered (trigger is " + ConvToStr(f->lines) +
+                                       " lines in " + ConvToStr(f->secs) + " secs)";
 
                                dest->KickUser(ServerInstance->FakeClient, user, kickMessage);