X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_mlock.cpp;h=abcd79667b13664c83d5a8ef46b51bcafba22b5f;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=b5f34c93614fa644a17b1dd799ddfeeab77f70cc;hpb=7d05c78517a4b6a4e98cd11e42fc9095bbca6689;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index b5f34c936..abcd79667 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -16,23 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 class ModuleMLock : public Module
 {
-private:
 	StringExtItem mlock;
 
 public:
 	ModuleMLock() : mlock("mlock", this) {};
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->Modules->Attach(I_OnPreMode, this);
-		ServerInstance->Extensions.Register(&this->mlock);
+		ServerInstance->Modules->AddService(this->mlock);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
 	}
@@ -42,7 +41,7 @@ public:
 		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
 	}
 
-	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -51,22 +50,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++)
+		std::string::size_type p = parameters[1].find_first_of(*mlock_str);
+		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(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());
+			return MOD_RES_DENY;
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
-
 };
 
 MODULE_INIT(ModuleMLock)