From 0099f31acf43bf62ab6b9785dd06ecff92b05119 Mon Sep 17 00:00:00 2001 From: "B.Greenham" Date: Thu, 25 Feb 2010 20:41:19 -0500 Subject: [PATCH] Add some code back in that I accidentally deleted. --- modules/core/m_message.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/core/m_message.c b/modules/core/m_message.c index 3e7aebc..1ac0cfb 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -759,8 +759,14 @@ msg_client(int p_or_n, const char *command, if(MyClient(target_p)) { + if (IsSetNoCTCP(target_p) && p_or_n != NOTICE && *text == '\001' && strncasecmp(text + 1, "ACTION", 6)) + { + sendto_one_numeric(source_p, ERR_NOCTCP, + form_str(ERR_NOCTCP), + target_p->name); + } /* XXX Controversial? allow opers always to send through a +g */ - if(!IsServer(source_p) && (IsSetCallerId(target_p) || + else if(!IsServer(source_p) && (IsSetCallerId(target_p) || (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) || (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0]))) {