X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=f288820b8b12f3b1e238274a9db550f32b2cfb22;hb=9cf381330eab69d7e5bf26684d1ec8075aee60a2;hp=0b4e39764151486e9b12d9a1318cd2abd5689a66;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 0b4e39764..f288820b8 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -20,95 +20,88 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +C */
-
-class NoCTCP : public ModeHandler
+class NoCTCPUser : public SimpleUserModeHandler
 {
- public:
-	NoCTCP(Module* Creator) : ModeHandler(Creator, "noctcp", 'C', PARAM_NONE, MODETYPE_CHANNEL) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+public:
+	NoCTCPUser(Module* Creator)
+		: SimpleUserModeHandler(Creator, "u_noctcp", 'T')
 	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('C'))
-			{
-				channel->SetMode('C',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('C'))
-			{
-				channel->SetMode('C',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
+		if (!ServerInstance->Config->ConfValue("noctcp")->getBool("enableumode"))
+			DisableAutoRegister();
 	}
 };
 
 class ModuleNoCTCP : public Module
 {
-
-	NoCTCP nc;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nc;
+	NoCTCPUser ncu;
 
  public:
-
 	ModuleNoCTCP()
-		: nc(this)
+		: exemptionprov(this)
+		, nc(this, "noctcp", 'C')
+		, ncu(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&nc))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	virtual ~ModuleNoCTCP()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR);
 	}
 
-	virtual Version GetVersion()
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		return Version("Provides support for unreal-style channel mode +C", VF_VENDOR);
-	}
+		if (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
 
-	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
-	}
+		std::string ctcpname;
+		if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
+			return MOD_RES_PASSTHRU;
 
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		switch (target.type)
 		{
-			Channel* c = (Channel*)dest;
-			ModResult res = ServerInstance->OnCheckExemption(user,c,"noctcp");
+			case MessageTarget::TYPE_CHANNEL:
+			{
+				if (user->HasPrivPermission("channels/ignore-noctcp"))
+					return MOD_RES_PASSTHRU;
 
-			if (res == MOD_RES_ALLOW)
-				return MOD_RES_PASSTHRU;
+				Channel* c = target.Get<Channel>();
+				ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
+				if (res == MOD_RES_ALLOW)
+					return MOD_RES_PASSTHRU;
 
-			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet('C')))
+				if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
+				{
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
+					return MOD_RES_DENY;
+				}
+				break;
+			}
+			case MessageTarget::TYPE_USER:
 			{
-				if ((text.length()) && (text[0] == '\1'))
+				if (user->HasPrivPermission("users/ignore-noctcp"))
+					return MOD_RES_PASSTHRU;
+
+				User* u = target.Get<User>();
+				if (u->IsModeSet(ncu))
 				{
-					if (strncmp(text.c_str(),"\1ACTION ",8))
-					{
-						user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
-						return MOD_RES_DENY;
-					}
+					user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
+					return MOD_RES_DENY;
 				}
+				break;
 			}
+			case MessageTarget::TYPE_SERVER:
+				break;
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('C');
+		tokens["EXTBAN"].push_back('C');
 	}
 };