X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_servprotect.cpp;h=2b550408cebb8f0fd96b0bdcf3a5496ff1a3e88c;hb=19cc8380fb9060add68852e40846b10e4d1f18f5;hp=82ad0920bb143a61cd95a23e9f8554c38c93a3c1;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 82ad0920b..2b550408c 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides usermode +k to protect services from kicks, kills and mode changes. */
-
 /** Handles user mode +k
  */
 class ServProtectMode : public ModeHandler
@@ -56,8 +54,6 @@ class ModuleServProtectMode : public Module
 	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(bm);
-		Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode, I_OnUserPreKick };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
@@ -67,7 +63,7 @@ class ModuleServProtectMode : public Module
 
 	void OnWhois(User* user, User* dest) CXX11_OVERRIDE
 	{
-		if (dest->IsModeSet('k'))
+		if (dest->IsModeSet(bm))
 		{
 			ServerInstance->SendWhoisLine(user, dest, 310, user->nick+" "+dest->nick+" :is a Network Service on "+ServerInstance->Config->Network);
 		}
@@ -90,7 +86,7 @@ class ModuleServProtectMode : public Module
 				 * This includes any prefix permission mode, even those registered in other modules, e.g. +qaohv. Using ::ModeString()
 				 * here means that the number of modes is restricted to only modes the user has, limiting it to as short a loop as possible.
 				 */
-				if (u->IsModeSet('k') && memb && memb->modes.find(mode) != std::string::npos)
+				if (u->IsModeSet(bm) && memb && memb->modes.find(mode) != std::string::npos)
 				{
 					/* BZZZT, Denied! */
 					user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network.c_str());
@@ -107,7 +103,7 @@ class ModuleServProtectMode : public Module
 		if (src == NULL)
 			return MOD_RES_PASSTHRU;
 
-		if (dst->IsModeSet('k'))
+		if (dst->IsModeSet(bm))
 		{
 			src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network.c_str());
 			ServerInstance->SNO->WriteGlobalSno('a', src->nick+" tried to kill service "+dst->nick+" ("+reason+")");
@@ -118,7 +114,7 @@ class ModuleServProtectMode : public Module
 
 	ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason) CXX11_OVERRIDE
 	{
-		if (memb->user->IsModeSet('k'))
+		if (memb->user->IsModeSet(bm))
 		{
 			src->WriteNumeric(484, "%s %s :You are not permitted to kick services",
 				src->nick.c_str(), memb->chan->name.c_str());
@@ -130,7 +126,7 @@ class ModuleServProtectMode : public Module
 
 	ModResult OnWhoisLine(User* src, User* dst, int &numeric, std::string &text) CXX11_OVERRIDE
 	{
-		return ((src != dst) && (numeric == 319) && dst->IsModeSet('k')) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
+		return ((src != dst) && (numeric == 319) && dst->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 };