X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=3eb0bfd8175f2ec8c2975c3cdfc78c0fefd25d47;hb=27cef863f7286b626e01f1287f31005478a66fea;hp=fae1bb0eb264693dbf91b131fbdc37ca062de255;hpb=95ff25c7173556d26cccd49dea87a5a52c326e79;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index fae1bb0eb..3eb0bfd81 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -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 };
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
+	virtual ~ModuleNoCTCP()
+	{
+		ServerInstance->Modes->DelMode(nc);
+		delete nc;
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version(1,2,0,0,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->IsExtBanned(user, 'C'))
 			{
 				if ((text.length()) && (text[0] == '\1'))
 				{
 					if (strncmp(text.c_str(),"\1ACTION ",8))
 					{
-						user->WriteNumeric(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,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		ServerInstance->AddExtBanChar('C');
 	}
 };