X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_mlock.cpp;h=43eadf63ee5d4222764c90ecdf3d5013e2928bda;hb=d736eba00b274c87662bd73a3acf8288135643d6;hp=9e3c596ccc4a64dbb5aec1d765039963bdf1aeb6;hpb=e4f9a63ecda239f4c53762d102360007751bcaed;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 9e3c596cc..43eadf63e 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -16,22 +16,17 @@
* along with this program. If not, see .
*/
+
#include "inspircd.h"
-class ModuleMLock : public Module {
-private:
+class ModuleMLock : public Module
+{
StringExtItem mlock;
public:
ModuleMLock() : mlock("mlock", this) {};
- void init()
- {
- Implementation eventlist[] = { I_OnPreMode };
- ServerInstance->Modules->Attach(eventlist, this, 1);
- }
-
- Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
}
@@ -41,7 +36,7 @@ public:
ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
}
- ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector& parameters)
+ ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector& parameters) CXX11_OVERRIDE
{
if (!channel)
return MOD_RES_PASSTHRU;
@@ -50,22 +45,19 @@ 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 = parameters[1].find_first_of(*mlock_str);
+ 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(), parameters[1][p], mlock_str->c_str());
+ return MOD_RES_DENY;
}
return MOD_RES_PASSTHRU;
}
-
};
MODULE_INIT(ModuleMLock)