X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_mlock.cpp;h=d9c43ec1087c6b0026a21c85b4b4d0493754638f;hb=3ccf0065d43db80f31c6404aeac4d65551481508;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..d9c43ec10 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -16,32 +16,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
-class ModuleMLock : public Module {
-private:
+class ModuleMLock : public Module
+{
 	StringExtItem mlock;
 
-public:
-	ModuleMLock() : mlock("mlock", this) {};
-
-	void init()
+ public:
+	ModuleMLock()
+		: mlock("mlock", this)
 	{
-		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);
 	}
 
-	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)
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -50,22 +43,20 @@ 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))
-			{
-				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;
 	}
-
 };
 
 MODULE_INIT(ModuleMLock)