X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_mlock.cpp;h=d9c43ec1087c6b0026a21c85b4b4d0493754638f;hb=b9006ce3cba742ca2a22d601ba1a63a47b0402c9;hp=8ad062aea348b6165d97cb34cacd475e3f8ffedb;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 8ad062aea..d9c43ec10 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -23,13 +23,10 @@ class ModuleMLock : public Module
 {
 	StringExtItem mlock;
 
-public:
-	ModuleMLock() : mlock("mlock", this) {};
-
-	void init() CXX11_OVERRIDE
+ public:
+	ModuleMLock()
+		: mlock("mlock", this)
 	{
-		ServerInstance->Modules->Attach(I_OnPreMode, this);
-		ServerInstance->Modules->AddService(this->mlock);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
@@ -37,12 +34,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<std::string>& parameters) CXX11_OVERRIDE
+	ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding)
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -54,11 +46,12 @@ public:
 		if (!mlock_str)
 			return MOD_RES_PASSTHRU;
 
-		std::string::size_type p = parameters[1].find_first_of(*mlock_str);
+		const char mode = mh->GetModeChar();
+		std::string::size_type p = mlock_str->find(mode);
 		if (p != std::string::npos)
 		{
 			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());
+					     channel->name.c_str(), mode, mlock_str->c_str());
 			return MOD_RES_DENY;
 		}