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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 00eea1309..3eb0bfd81 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -57,10 +57,20 @@ class ModuleNoCTCP : public Module
 		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)
 	{
@@ -78,13 +88,13 @@ class ModuleNoCTCP : public Module
 				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_str(), c->name.c_str());
+						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()
+	virtual void On005Numeric(std::string &output)
 	{
-		ServerInstance->Modes->DelMode(nc);
-		delete nc;
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		ServerInstance->AddExtBanChar('C');
 	}
 };