Some more text fixes and improvements (#1618).

[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 9fe5eb224474c6e6d50e80c0018ca48ac0ccd62a..25345506e5a517faae5273543584f4b26c973056 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,113 +1,76 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2004-2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +c */
+#include "inspircd.h"
+#include "modules/exemption.h"
 
-/** Handles the +c channel mode
- */
-class BlockColor : public ModeHandler
+class ModuleBlockColor : public Module
 {
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler bc;
  public:
-       BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModuleBlockColor()
+               : exemptionprov(this)
+               , bc(this, "blockcolor", 'c')
        {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('c'))
-                       {
-                               channel->SetMode('c',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('c'))
-                       {
-                               channel->SetMode('c',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
        }
-};
 
-class ModuleBlockColour : public Module
-{
-       bool AllowChanOps;      
-       BlockColor *bc;
- public:
- 
-       ModuleBlockColour(InspIRCd* Me) : Module(Me)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               bc = new BlockColor(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(bc))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               tokens["EXTBAN"].push_back('c');
        }
 
-
-
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       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;
-                       
-                       if(c->IsModeSet('c'))
+                       Channel* c = target.Get<Channel>();
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
+
+                       if (res == MOD_RES_ALLOW)
+                               return MOD_RES_PASSTHRU;
+
+                       if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
                        {
-                               if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
+                               for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
                                {
-                                       for (std::string::iterator i = text.begin(); i != text.end(); i++)
+                                       // Block all control codes except \001 for CTCP
+                                       if ((*i >= 0) && (*i < 32) && (*i != 1))
                                        {
-                                               switch (*i)
-                                               {
-                                                       case 2:
-                                                       case 3:
-                                                       case 15:
-                                                       case 21:
-                                                       case 22:
-                                                       case 31:
-                                                               user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
-                                                               return 1;
-                                                       break;
-                                               }
+                                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c is set)");
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
                }
-               return 0;
-       }
-       
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleBlockColour()
-       {
-               ServerInstance->Modes->DelMode(bc);
-               delete bc;
-       }
-       
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides channel mode +c to block color",VF_VENDOR);
        }
 };
 
-MODULE_INIT(ModuleBlockColour)
+MODULE_INIT(ModuleBlockColor)