X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=e769ba4203e3626e5486b9c521457ab12389858f;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=029a950651e51127a1ba0c6ae39e5d8e0030895d;hpb=0b34769b9e3b9e823763cfd8bf3e2d64c2426710;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 029a95065..e769ba420 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,133 +1,81 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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"
-#include "inspircd.h"
-
-/* $ModDesc: Provides support for unreal-style channel mode +c */
 
+#include "inspircd.h"
 
+/* $ModDesc: Provides channel mode +C to block CTCPs */
 
-class NoCTCP : public ModeHandler
+class NoCTCP : public SimpleChannelModeHandler
 {
  public:
-	NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		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;
-	}
+	NoCTCP(Module* Creator) : SimpleChannelModeHandler(Creator, "noctcp", 'C') { }
 };
 
 class ModuleNoCTCP : public Module
 {
-	
-	NoCTCP* nc;
-	
+	NoCTCP nc;
+
  public:
- 
-	ModuleNoCTCP(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleNoCTCP()
+		: nc(this)
 	{
-		
-		nc = new NoCTCP(ServerInstance);
-		if (!ServerInstance->AddMode(nc, 'C'))
-			throw ModuleException("Could not add new modes!");
 	}
 
-	void Implements(char* List)
+	void init() CXX11_OVERRIDE
 	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		ServerInstance->Modules->AddService(nc);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
+		return Version("Provides channel mode +C to block CTCPs", VF_VENDOR);
 	}
-	
-	virtual int OnUserPreNotice(userrec* 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_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsModeSet('C'))
+			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(nc)))
 			{
-				if ((text.length()) && (text[0] == '\1'))
-				{
-					if (strncmp(text.c_str(),"\1ACTION ",8))
-					{
-						user->WriteServ("492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-						return 1;
-					}
-				}
+				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 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoCTCP()
-	{
-		ServerInstance->Modes->DelMode(nc);
-		DELETE(nc);
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
-	}
-};
-
-
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('C');
 	}
-	
-	~ModuleNoCTCPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoCTCP(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)