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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index a3c82bd15..58b9b7dcb 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,144 +2,108 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 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.
  *
  * ---------------------------------------------------
  */
 
-#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 */
+/* $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);
-	}
+	NoCTCP(Module* Creator) : ModeHandler(Creator, 'C', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "C";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
-        }
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		if (target_type == TYPE_CHANNEL)
+		if (adding)
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
+			if (!channel->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);
-						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 == TYPE_CHANNEL)
+		else
 		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
+			if (channel->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);
-						return 1;
-					}
-				}
+				channel->SetMode('C',false);
+				return MODEACTION_ALLOW;
 			}
 		}
-		return 0;
+
+		return MODEACTION_DENY;
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+};
+
+class ModuleNoCTCP : public Module
+{
+
+	NoCTCP nc;
+
+ public:
+
+	ModuleNoCTCP()
+		: nc(this)
 	{
-		// check if this is our mode character...
-		if ((modechar == 'C') && (type == MT_CHANNEL))
-  		{
-  			log(DEBUG,"Allowing C change");
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
+		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);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-};
-
 
-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 (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->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)