Fix cloaking not ignoring the case of a user's hostname.

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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index af14c73ec14fa8e4ebc623f27b7339822f29b2df..475151cb75167ce5b77d3342b87978a1e37adf9a 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -61,27 +61,48 @@ class ModuleNoCTCP : public Module
                if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
                        return MOD_RES_PASSTHRU;
 
-               if (target.type == MessageTarget::TYPE_CHANNEL)
+               switch (target.type)
                {
-                       Channel* c = target.Get<Channel>();
-                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
-                       if (res == MOD_RES_ALLOW)
-                               return MOD_RES_PASSTHRU;
-
-                       if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
+                       case MessageTarget::TYPE_CHANNEL:
                        {
-                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C set)");
-                               return MOD_RES_DENY;
+                               if (user->HasPrivPermission("channels/ignore-noctcp"))
+                                       return MOD_RES_PASSTHRU;
+
+                               Channel* c = target.Get<Channel>();
+                               ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
+                               if (res == MOD_RES_ALLOW)
+                                       return MOD_RES_PASSTHRU;
+
+                               if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
+                               {
+                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
+                                       return MOD_RES_DENY;
+                               }
+
+                               const Channel::MemberMap& members = c->GetUsers();
+                               for (Channel::MemberMap::const_iterator member = members.begin(); member != members.end(); ++member)
+                               {
+                                       User* u = member->first;
+                                       if (u->IsModeSet(ncu))
+                                               details.exemptions.insert(u);
+                               }
+                               break;
                        }
-               }
-               else if (target.type == MessageTarget::TYPE_USER)
-               {
-                       User* u = target.Get<User>();
-                       if (u->IsModeSet(ncu))
+                       case MessageTarget::TYPE_USER:
                        {
-                               user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T set)");
-                               return MOD_RES_PASSTHRU;
+                               if (user->HasPrivPermission("users/ignore-noctcp"))
+                                       return MOD_RES_PASSTHRU;
+
+                               User* u = target.Get<User>();
+                               if (u->IsModeSet(ncu))
+                               {
+                                       user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
+                                       return MOD_RES_DENY;
+                               }
+                               break;
                        }
+                       case MessageTarget::TYPE_SERVER:
+                               break;
                }
                return MOD_RES_PASSTHRU;
        }