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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index bb9fa4e89..2f2b3d011 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -13,7 +13,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+/* $ModDesc: Provides support for unreal-style channel mode +C */
 
 class NoCTCP : public ModeHandler
 {
@@ -45,46 +45,56 @@ class NoCTCP : public ModeHandler
 
 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 };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
+	virtual ~ModuleNoCTCP()
+	{
+		ServerInstance->Modes->DelMode(nc);
+		delete nc;
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+	}
 
 	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);
 	}
-	
+
 	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'))
+
+			if (c->IsModeSet('C') || c->GetExtBanStatus(user, 'C') < 0)
 			{
 				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);
+						user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
 						return 1;
 					}
 				}
@@ -93,15 +103,9 @@ class ModuleNoCTCP : public Module
 		return 0;
 	}
 
-	virtual ~ModuleNoCTCP()
-	{
-		ServerInstance->Modes->DelMode(nc);
-		delete nc;
-	}
-
-	virtual Version GetVersion()
+	virtual void On005Numeric(std::string &output)
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		ServerInstance->AddExtBanChar('C');
 	}
 };