X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fmodules%2Fm_mlock.cpp;h=d1df81354b65e7ce9c64b5b9cbbbe1b4026488e4;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=17deb17bd9961806aa858140c5f79f789584ffe6;hpb=1b909065b0fc7789a4a33dce56219befa602b8ec;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 17deb17bd..d1df81354 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -16,6 +16,9 @@
* along with this program. If not, see .
*/
+
+/* $ModDesc: Implements the ability to have server-side MLOCK enforcement. */
+
#include "inspircd.h"
class ModuleMLock : public Module
@@ -28,7 +31,8 @@ public:
void init()
{
- ServerInstance->Modules->Attach(I_OnPreMode, this);
+ ServerInstance->Modules->Attach(I_OnRawMode, this);
+ ServerInstance->Modules->AddService(this->mlock);
}
Version GetVersion()
@@ -36,12 +40,7 @@ public:
return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
}
- void Prioritize()
- {
- ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
- }
-
- ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector& parameters)
+ ModResult OnRawMode(User* source, Channel* channel, const char mode, const std::string& parameter, bool adding, int pcnt)
{
if (!channel)
return MOD_RES_PASSTHRU;
@@ -50,17 +49,15 @@ public:
return MOD_RES_PASSTHRU;
std::string *mlock_str = mlock.get(channel);
- if (!mlock_str || mlock_str->empty())
+ if (!mlock_str)
return MOD_RES_PASSTHRU;
- for (const char *modes = parameters[1].c_str(); *modes; modes++)
+ std::string::size_type p = mlock_str->find(mode);
+ if (p != std::string::npos)
{
- if (mlock_str->find(*modes))
- {
- source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
- channel->name.c_str(), *modes, mlock_str->c_str());
- return MOD_RES_DENY;
- }
+ source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
+ channel->name.c_str(), mode, mlock_str->c_str());
+ return MOD_RES_DENY;
}
return MOD_RES_PASSTHRU;