X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_noctcp.cpp;h=58b9b7dcb513c2645023dfcebd0c85bda72fbb5a;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=273c6c93e8d2f89258b91922d98bb24bd45df101;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 273c6c93e..58b9b7dcb 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,37 +2,25 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
-
-extern InspIRCd* ServerInstance;
+/* $ModDesc: Provides support for unreal-style channel mode +C */
 
 class NoCTCP : public ModeHandler
 {
  public:
-	NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	NoCTCP(Module* Creator) : ModeHandler(Creator, 'C', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -57,87 +45,65 @@ class NoCTCP : public ModeHandler
 
 class ModuleNoCTCP : public Module
 {
-	
-	NoCTCP* nc;
-	
+
+	NoCTCP nc;
+
  public:
- 
-	ModuleNoCTCP(InspIRCd* Me)
-		: Module::Module(Me)
+
+	ModuleNoCTCP()
+		: nc(this)
 	{
-		
-		nc = new NoCTCP(ServerInstance);
-		ServerInstance->AddMode(nc, 'C');
+		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);
 	}
 
-	void Implements(char* List)
+	virtual ~ModuleNoCTCP()
 	{
-		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		ServerInstance->Modes->DelMode(&nc);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual Version GetVersion()
 	{
-		ServerInstance->ModeGrok->InsertMode(output,"C",4);
+		return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+	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);
+		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (target_type == TYPE_CHANNEL)
+		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsModeSet('C'))
+			Channel* c = (Channel*)dest;
+
+			if (CHANOPS_EXEMPT('C') && c->GetPrefixValue(user) == OP_VALUE)
+			{
+				return MOD_RES_PASSTHRU;
+			}
+
+			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet('C')))
 			{
 				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()
-	{
-		DELETE(nc);
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-	}
-};
-
-
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
-	{
-	}
-	
-	~ModuleNoCTCPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+	virtual void On005Numeric(std::string &output)
 	{
-		return new ModuleNoCTCP(Me);
+		ServerInstance->AddExtBanChar('C');
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)