X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=2f2b3d01170021fd706dbe1b764f72e1a7387b1c;hb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;hp=3a795927747151480b0afda61b1ab6abb966ed76;hpb=765cdd25cb1e3ad1b38a11865a9730e65be4b4e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 3a7959277..2f2b3d011 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,90 +1,112 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +Q */
+/* $ModDesc: Provides support for unreal-style channel mode +C */
 
-class ModuleNoCTCP : public Module
+class NoCTCP : public ModeHandler
 {
-	Server *Srv;
-	
  public:
- 
-	ModuleNoCTCP()
-	{
-		Srv = new Server;
-		Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
-	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+	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 (target_type == TARGET_CHANNEL)
+		if (adding)
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
+			if (!channel->IsModeSet('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;
-				}
+				channel->SetMode('C',true);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
-	}
-	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
-	{
-		if (target_type == TARGET_CHANNEL)
+		else
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
+			if (channel->IsModeSet('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;
-				}
+				channel->SetMode('C',false);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
+
+		return MODEACTION_DENY;
 	}
-	
+};
+
+class ModuleNoCTCP : public Module
+{
+
+	NoCTCP* nc;
+
+ public:
+
+	ModuleNoCTCP(InspIRCd* Me)
+		: Module(Me)
+	{
+
+		nc = new NoCTCP(ServerInstance);
+		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);
+	}
+
 	virtual ~ModuleNoCTCP()
 	{
-		delete Srv;
+		ServerInstance->Modes->DelMode(nc);
+		delete nc;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-};
-
 
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
+	virtual int 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 int 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 (CHANOPS_EXEMPT(ServerInstance, 'C') && c->GetStatus(user) == STATUS_OP)
+			{
+				return 0;
+			}
+
+			if (c->IsModeSet('C') || c->GetExtBanStatus(user, 'C') < 0)
+			{
+				if ((text.length()) && (text[0] == '\1'))
+				{
+					if (strncmp(text.c_str(),"\1ACTION ",8))
+					{
+						user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
+						return 1;
+					}
+				}
+			}
+		}
+		return 0;
 	}
-	
-	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)