X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_mlock.cpp;h=d3ab5b9fd2af0700fb6b26e2e95cad0b59183020;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=d1df81354b65e7ce9c64b5b9cbbbe1b4026488e4;hpb=d0a6b9c6eab666136af529953ebd585986a19848;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index d1df81354..d3ab5b9fd 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -17,30 +17,24 @@
  */
 
 
-/* $ModDesc: Implements the ability to have server-side MLOCK enforcement. */
-
 #include "inspircd.h"
 
 class ModuleMLock : public Module
 {
-private:
 	StringExtItem mlock;
 
-public:
-	ModuleMLock() : mlock("mlock", this) {};
-
-	void init()
+ public:
+	ModuleMLock()
+		: mlock("mlock", ExtensionItem::EXT_CHANNEL, this)
 	{
-		ServerInstance->Modules->Attach(I_OnRawMode, this);
-		ServerInstance->Modules->AddService(this->mlock);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
 	}
 
-	ModResult OnRawMode(User* source, Channel* channel, const char mode, const std::string& parameter, bool adding, int pcnt)
+	ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding)
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -52,17 +46,16 @@ public:
 		if (!mlock_str)
 			return MOD_RES_PASSTHRU;
 
+		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(), mode, mlock_str->c_str());
+			source->WriteNumeric(742, channel->name, mode, *mlock_str, "MODE cannot be set due to channel having an active MLOCK restriction policy");
 			return MOD_RES_DENY;
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
-
 };
 
 MODULE_INIT(ModuleMLock)