httpd connection close fixes (these need to be backported to 1.1 at some point?)...

[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 0eff817aa3f7ed88eb5aecbb1733300f917f255f..25350b15b006b6445b285d0b693bb4c550b55303 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -232,24 +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::vector<std::string> parameters(3);
+                                       parameters.push_back(dest->name);
+                                       parameters.push_back("+b");
+                                       parameters.push_back(user->MakeWildHost());
+                                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 
-                                       parameterlist n;
-                                       n.push_back("+b");
-                                       n.push_back(user->MakeWildHost());
-                                       ServerInstance->PI->SendMode(dest->name, n);
+                                       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;
                        }
                }