X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=25345506e5a517faae5273543584f4b26c973056;hb=85182d727c0d549b9cf6659ad36dec70fcf02278;hp=175c3b793918b45cbc2c58629e81966f73bfb526;hpb=dcd3438011d59aa4de4df64abf06bca1cbf36859;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 175c3b793..25345506e 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -24,23 +24,15 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-/** Handles the +c channel mode
- */
-class BlockColor : public SimpleChannelModeHandler
-{
- public:
-	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
-};
-
 class ModuleBlockColor : public Module
 {
 	CheckExemption::EventProvider exemptionprov;
-	BlockColor bc;
+	SimpleChannelModeHandler bc;
  public:
 
 	ModuleBlockColor()
 		: exemptionprov(this)
-		, bc(this)
+		, bc(this, "blockcolor", 'c')
 	{
 	}
 
@@ -49,11 +41,11 @@ class ModuleBlockColor : public Module
 		tokens["EXTBAN"].push_back('c');
 	}
 
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			Channel* c = (Channel*)dest;
+			Channel* c = target.Get<Channel>();
 			ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
 
 			if (res == MOD_RES_ALLOW)
@@ -61,19 +53,13 @@ class ModuleBlockColor : public Module
 
 			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
 			{
-				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
 				{
-					switch (*i)
+					// Block all control codes except \001 for CTCP
+					if ((*i >= 0) && (*i < 32) && (*i != 1))
 					{
-						case 2:
-						case 3:
-						case 15:
-						case 21:
-						case 22:
-						case 31:
-							user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
-							return MOD_RES_DENY;
-						break;
+						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c is set)");
+						return MOD_RES_DENY;
 					}
 				}
 			}