Add {To,From}{Human,Internal,Network} to ExtensionItem.

[user/henk/code/inspircd.git] / src / modules / m_blockcolor.cpp

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index e3135185d2e63b55ec73599ff0f073c6b97c1433..25345506e5a517faae5273543584f4b26c973056 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -41,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)
@@ -53,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;
                                        }
                                }
                        }