X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_mlock.cpp;h=85787ae9644b2e6c2c21983141c9a8fb3ceea46c;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=e9ca3bfd0c0dc042f2a5b81466df755d977de252;hpb=804c02174fd61143f6da5580dd0e28bd9f1bb8a8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index e9ca3bfd0..85787ae96 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -17,35 +17,30 @@
  */
 
 
-/* $ModDesc: Implements the ability to have server-side MLOCK enforcement. */
-
 #include "inspircd.h"
 
+enum
+{
+	// From Charybdis.
+	ERR_MLOCKRESTRICTED = 742
+};
+
 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_OnPreMode, this);
-		ServerInstance->Extensions.Register(&this->mlock);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		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)
+	ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -54,22 +49,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++)
+		const char mode = mh->GetModeChar();
+		std::string::size_type p = mlock_str->find(mode);
+		if (p != std::string::npos)
 		{
-			if (mlock_str->find(*modes) != 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(), *modes, mlock_str->c_str());
-				return MOD_RES_DENY;
-			}
+			source->WriteNumeric(ERR_MLOCKRESTRICTED, 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)