Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index b10ed36042b62d50fb4503de031623d05e6eb2e4..2ed17a9144b878a6d34c233bc897f99e43f19362 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,11 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
  *
  * 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
@@ -24,24 +27,23 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-/* Written by Om<om@inspircd.org>, April 2005. */
-/* Rewritten to use the listmode utility by Om, December 2005 */
-/* Adapted from m_exception, which was originally based on m_chanprotect and m_silence */
-
-// The +e channel mode takes a nick!ident@host, glob patterns allowed,
-// and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them
-// Now supports CIDR and IP addresses -- Brain
-
+enum
+{
+       // From RFC 2812.
+       RPL_EXCEPTLIST = 348,
+       RPL_ENDOFEXCEPTLIST = 349
+};
 
-/** Handles +e channel mode
- */
 class BanException : public ListModeBase
 {
  public:
-       BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { }
+       BanException(Module* Creator)
+               : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", RPL_EXCEPTLIST, RPL_ENDOFEXCEPTLIST, true)
+       {
+               syntax = "<mask>";
+       }
 };
 
-
 class ModuleBanException : public Module
 {
        BanException be;
@@ -53,28 +55,24 @@ class ModuleBanException : public Module
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               tokens["EXCEPTS"] = "e";
+               tokens["EXCEPTS"] = ConvToStr(be.GetModeChar());
        }
 
        ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE
        {
-               if (chan != NULL)
-               {
-                       ListModeBase::ModeList *list = be.GetList(chan);
+               ListModeBase::ModeList* list = be.GetList(chan);
+               if (!list)
+                       return MOD_RES_PASSTHRU;
 
-                       if (!list)
-                               return MOD_RES_PASSTHRU;
+               for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+               {
+                       if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
+                               continue;
 
-                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+                       if (chan->CheckBan(user, it->mask.substr(2)))
                        {
-                               if (it->mask[0] != type || it->mask[1] != ':')
-                                       continue;
-
-                               if (chan->CheckBan(user, it->mask.substr(2)))
-                               {
-                                       // They match an entry on the list, so let them pass this.
-                                       return MOD_RES_ALLOW;
-                               }
+                               // They match an entry on the list, so let them pass this.
+                               return MOD_RES_ALLOW;
                        }
                }
 
@@ -83,23 +81,19 @@ class ModuleBanException : public Module
 
        ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE
        {
-               if (chan)
+               ListModeBase::ModeList* list = be.GetList(chan);
+               if (!list)
                {
-                       ListModeBase::ModeList *list = be.GetList(chan);
-
-                       if (!list)
-                       {
-                               // No list, proceed normally
-                               return MOD_RES_PASSTHRU;
-                       }
+                       // No list, proceed normally
+                       return MOD_RES_PASSTHRU;
+               }
 
-                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+               for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
+               {
+                       if (chan->CheckBan(user, it->mask))
                        {
-                               if (chan->CheckBan(user, it->mask))
-                               {
-                                       // They match an entry on the list, so let them in.
-                                       return MOD_RES_ALLOW;
-                               }
+                               // They match an entry on the list, so let them in.
+                               return MOD_RES_ALLOW;
                        }
                }
                return MOD_RES_PASSTHRU;
@@ -112,7 +106,7 @@ class ModuleBanException : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the +e channel mode", VF_VENDOR);
+               return Version("Adds channel mode e (banexception) which allows channel operators to exempt user masks from the b (ban) channel mode.", VF_VENDOR);
        }
 };