X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_mlock.cpp;h=719701d02beee2018aeaeef16d01d51c84d77dd1;hb=8d172c077e41e08e3864615538c6b06f07f24d84;hp=7e891f1468c937883ecf3745cf846bbc86e37c20;hpb=19a3ffd76d3fb0fba5d32ac6fc528efef9a28cc7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 7e891f146..719701d02 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -16,9 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+/* $ModDesc: Implements the ability to have server-side MLOCK enforcement. */
+
 #include "inspircd.h"
 
-class ModuleMLock : public Module {
+class ModuleMLock : public Module
+{
 private:
 	StringExtItem mlock;
 
@@ -27,8 +31,8 @@ public:
 
 	void init()
 	{
-		Implementation eventlist[] = { I_OnPreMode };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->Attach(I_OnPreMode, this);
+		ServerInstance->Modules->AddService(this->mlock);
 	}
 
 	Version GetVersion()
@@ -46,18 +50,19 @@ public:
 		if (!channel)
 			return MOD_RES_PASSTHRU;
 
+		if (!IS_LOCAL(source))
+			return MOD_RES_PASSTHRU;
+
 		std::string *mlock_str = mlock.get(channel);
-		if (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))
-			{
-				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;