X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_mlock.cpp;h=5c302961d19b2def73d73896885a7df815503f6c;hb=HEAD;hp=d9c43ec1087c6b0026a21c85b4b4d0493754638f;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index d9c43ec10..5c302961d 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -1,7 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2012 William Pitcock <nenolod@dereferenced.org>
+ *   Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Ariadne Conill <ariadne@dereferenced.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -19,22 +22,28 @@
 
 #include "inspircd.h"
 
+enum
+{
+	// From Charybdis.
+	ERR_MLOCKRESTRICTED = 742
+};
+
 class ModuleMLock : public Module
 {
 	StringExtItem mlock;
 
  public:
 	ModuleMLock()
-		: mlock("mlock", this)
+		: mlock("mlock", ExtensionItem::EXT_CHANNEL, this)
 	{
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
+		return Version("Allows services to lock channel modes so that they can not be changed.", VF_VENDOR);
 	}
 
-	ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding)
+	ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -50,8 +59,7 @@ class ModuleMLock : public Module
 		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(ERR_MLOCKRESTRICTED, channel->name, mode, *mlock_str, "MODE cannot be set due to the channel having an active MLOCK restriction policy");
 			return MOD_RES_DENY;
 		}