X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=1755f8e41f2eacc0c1e6401b42906ce658ce320f;hb=cccc3895cc0784458d730997186d3c0bc5db1539;hp=bf7cb8d627b41f908a0c937292c5dc4696377565;hpb=50460419e6f76eecd57dc72a4f2fcc88dc114a50;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index bf7cb8d62..1755f8e41 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,65 +1,115 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | 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.
+ * 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"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
+class NoCTCP : public ModeHandler
+{
+ public:
+	NoCTCP() : ModeHandler('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;
+	}
+};
+
 class ModuleNoCTCP : public Module
 {
 	Server *Srv;
+	NoCTCP* nc;
 	
  public:
  
-	ModuleNoCTCP()
+	ModuleNoCTCP(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
+		Srv = Me;
+		nc = new NoCTCP();
+		Srv->AddMode(nc, 'C');
+	}
+
+	void Implements(char* List)
+	{
+		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+	}
+
+	virtual void On005Numeric(std::string &output)
+	{
+		InsertMode(output,"C",4);
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('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;
-				}
-			}
-		}
-		return 0;
+		return OnUserPreNotice(user,dest,target_type,text,status);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			if (c->IsCustomModeSet('C'))
+			if (c->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;
+					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;
 	}
-	
+
 	virtual ~ModuleNoCTCP()
 	{
-		delete Srv;
+		DELETE(nc);
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
 	}
 };
 
@@ -75,9 +125,9 @@ class ModuleNoCTCPFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleNoCTCP;
+		return new ModuleNoCTCP(Me);
 	}
 	
 };