Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 06ce93a579d53715590138c1f3a3497b8ef68bb6..604c144e4b153ab2927a843d2bb019ffe60ee0f6 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,89 +1,95 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "u_listmode.h"
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@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
+ * 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/>.
+ */
 
-/* $ModDesc: Provides support for the +I channel mode */
 
-/* Written by Om<om@inspircd.org>, April 2005. */
-/* Based on m_exception, which was originally based on m_chanprotect and m_silence */
+#include "inspircd.h"
+#include "listmode.h"
 
-// The +I channel mode takes a nick!ident@host, glob patterns allowed,
-// and if a user matches an entry on the +I list then they can join the channel, ignoring if +i is set on the channel
+enum
+{
+       // From RFC 2812.
+       RPL_INVEXLIST = 346,
+       RPL_ENDOFINVEXLIST = 347
+};
 
-class ModuleInviteException : public ListModeBaseModule
+class InviteException : public ListModeBase
 {
-public:
-       ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347")
+ public:
+       InviteException(Module* Creator)
+               : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", RPL_INVEXLIST, RPL_ENDOFINVEXLIST, true)
        {
+               syntax = "<mask>";
        }
-       
-       virtual void Implements(char* List)
+};
+
+class ModuleInviteException : public Module
+{
+       bool invite_bypass_key;
+       InviteException ie;
+public:
+       ModuleInviteException() : ie(this)
        {
-               this->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
        }
-       
-       virtual void On005Numeric(std::string &output)
+
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output.append(" INVEX=I");
-               output.insert(output.find("CHANMODES=", 0)+10, "I");
+               tokens["INVEX"] = ConvToStr(ie.GetModeChar());
        }
-        
-       virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+       ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE
        {
-               if(chan != NULL)
+               ListModeBase::ModeList* list = ie.GetList(chan);
+               if (list)
                {
-                       modelist* list = (modelist*)chan->GetExt(infokey);
-                       Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions");
-                       if (list)
+                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                               if (chan->CheckBan(user, it->mask))
                                {
-                                       if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
-                                       {
-                                               // They match an entry on the list, so let them in.
-                                               return 1;
-                                       }
+                                       return MOD_RES_ALLOW;
                                }
                        }
-                       // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
                }
 
-               return 0;               
+               return MOD_RES_PASSTHRU;
        }
-               
-       virtual Version GetVersion()
-       {
-               return Version(1, 0, 0, 2, VF_STATIC);
-       }
-};
 
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleInviteExceptionFactory()
+       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE
        {
+               if (invite_bypass_key)
+                       return OnCheckInvite(user, chan);
+               return MOD_RES_PASSTHRU;
        }
-       
-       ~ModuleInviteExceptionFactory()
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
+               ie.DoRehash();
+               invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true);
        }
-       
-       virtual Module * CreateModule(Server* serv)
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return new ModuleInviteException(serv);
+               return Version("Adds channel mode I (invex) which allows channel operators to exempt user masks from the i (inviteonly) channel mode.", VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)