X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_commonchans.cpp;h=5871f5f9dfada6aa47ef335dbd97cfdbb61fb964;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=877ba87d7fcb297dc2eff272cb4a04d369a14371;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 877ba87d7..5871f5f9d 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Adds user mode +c, which if set, users must be on a common channel with you to private message you */
-
 /** Handles user mode +c
  */
 class PrivacyMode : public SimpleUserModeHandler
@@ -35,28 +33,24 @@ class ModulePrivacyMode : public Module
  public:
 	ModulePrivacyMode() : pm(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&pm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-
-	virtual ~ModulePrivacyMode()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->Modules->AddService(pm);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_VENDOR);
 	}
 
-	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
 		if (target_type == TYPE_USER)
 		{
 			User* t = (User*)dest;
-			if (!IS_OPER(user) && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
+			if (!user->IsOper() && (t->IsModeSet(pm)) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
 			{
 				user->WriteNumeric(ERR_CANTSENDTOUSER, "%s %s :You are not permitted to send private messages to this user (+c set)", user->nick.c_str(), t->nick.c_str());
 				return MOD_RES_DENY;
@@ -64,12 +58,6 @@ class ModulePrivacyMode : public Module
 		}
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
-	}
 };
 
-
 MODULE_INIT(ModulePrivacyMode)