X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=e68cf72a0971474628173677a4d2d054867c00af;hb=caa89fb37c532930805f0b144e3298624ec1adec;hp=1b1f56397efb908080ed50c508e06e1b936b76a1;hpb=2a5384692bdcb9266f9dcca8bff18ff93f5bbd08;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 1b1f56397..e68cf72a0 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,55 +1,90 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $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) { }
+
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	{
+		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;
+	}
+};
+
 class ModuleNoCTCP : public Module
 {
-	Server *Srv;
+	
+	NoCTCP* nc;
 	
  public:
  
-	ModuleNoCTCP()
+	ModuleNoCTCP(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
+		
+		nc = new NoCTCP(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(nc))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+
+
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
-			{
-				if ((text.length()) && (text[0] == '\1'))
-				{
-					if (strncmp(text.c_str(),"\1ACTION ",8))
-					{
-						WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-						return 1;
-					}
-				}
-			}
-		}
-		return 0;
+		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+	virtual int 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->IsCustomModeSet('C'))
+			Channel* c = (Channel*)dest;
+			
+			if (CHANOPS_EXEMPT(ServerInstance, 'C') && c->GetStatus(user) == STATUS_OP)
+			{
+				return 0;
+			}
+			
+			if (c->IsModeSet('C'))
 			{
 				if ((text.length()) && (text[0] == '\1'))
 				{
 					if (strncmp(text.c_str(),"\1ACTION ",8))
 					{
-						WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
+						user->WriteNumeric(492, "%s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
 						return 1;
 					}
 				}
@@ -57,40 +92,17 @@ class ModuleNoCTCP : public Module
 		}
 		return 0;
 	}
-	
+
 	virtual ~ModuleNoCTCP()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(nc);
+		delete nc;
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
-	}
-};
-
 
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
-	{
-	}
-	
-	~ModuleNoCTCPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule()
+	virtual Version GetVersion()
 	{
-		return new ModuleNoCTCP;
+		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP)