X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_servprotect.cpp;h=099c1142a50ad63845c0a87c72a5a11777658be0;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=7df9effcc732d32ae5a59b18b55de5c38d5af8a9;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 7df9effcc..099c1142a 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -21,7 +21,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for Austhex style +k / UnrealIRCD +S services mode */
+/* $ModDesc: Provides usermode +k to protect services from kicks, kills and mode changes. */
 
 /** Handles user mode +k
  */
@@ -51,27 +51,25 @@ class ModuleServProtectMode : public Module
 	ModuleServProtectMode()
 		: bm(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&bm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode, I_OnUserPreKick };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-
-	~ModuleServProtectMode()
+	void init()
 	{
+		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()
 	{
-		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_VENDOR);
+		return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
 	}
 
-	void OnWhois(User* src, User* dst)
+	void OnWhois(User* user, User* dest)
 	{
-		if (dst->IsModeSet('k'))
+		if (dest->IsModeSet('k'))
 		{
-			ServerInstance->SendWhoisLine(src, dst, 310, std::string(src->nick)+" "+std::string(dst->nick)+" :is an "+ServerInstance->Config->Network+" Service");
+			ServerInstance->SendWhoisLine(user, dest, 310, user->nick+" "+dest->nick+" :is a Network Service on "+ServerInstance->Config->Network);
 		}
 	}
 
@@ -112,7 +110,7 @@ class ModuleServProtectMode : public Module
 		if (dst->IsModeSet('k'))
 		{
 			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', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")");
+			ServerInstance->SNO->WriteGlobalSno('a', src->nick+" tried to kill service "+dst->nick+" ("+reason+")");
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;