X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=1dd6fe34ad467d71617f55b52316685cc9b3e9b7;hb=64faca29b377185c4615c8f2e4eecedc7ad045d1;hp=bf7cb8d627b41f908a0c937292c5dc4696377565;hpb=50460419e6f76eecd57dc72a4f2fcc88dc114a50;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index bf7cb8d62..1dd6fe34a 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,90 +1,92 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+#include "inspircd.h"
+
+/* $ModDesc: Provides channel mode +C to block CTCPs */
+
+class NoCTCP : public SimpleChannelModeHandler
+{
+ public:
+	NoCTCP(Module* Creator) : SimpleChannelModeHandler(Creator, "noctcp", 'C') { }
+};
 
 class ModuleNoCTCP : public Module
 {
-	Server *Srv;
-	
+
+	NoCTCP nc;
+
  public:
- 
+
 	ModuleNoCTCP()
+		: nc(this)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
-	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
-	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
-			{
-				if ((text.length()) && (text[0] == '\1'))
-				{
-					WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-					return 1;
-				}
-			}
-		}
-		return 0;
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+
+	void init()
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
-			{
-				if ((text.length()) && (text[0] == '\1'))
-				{
-					WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-					return 1;
-				}
-			}
-		}
-		return 0;
+		ServerInstance->Modules->AddService(nc);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	
+
 	virtual ~ModuleNoCTCP()
 	{
-		delete Srv;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version("Provides channel mode +C to block CTCPs", VF_VENDOR);
 	}
-};
-
 
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
+	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);
 	}
-	
-	~ModuleNoCTCPFactory()
+
+	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)))
+		{
+			Channel* c = (Channel*)dest;
+			if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ",8)))
+				return MOD_RES_PASSTHRU;
+
+			ModResult res = ServerInstance->OnCheckExemption(user,c,"noctcp");
+			if (res == MOD_RES_ALLOW)
+				return MOD_RES_PASSTHRU;
+
+			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet('C')))
+			{
+				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;
+			}
+		}
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual void On005Numeric(std::string &output)
 	{
-		return new ModuleNoCTCP;
+		ServerInstance->AddExtBanChar('C');
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)