Merge pull request #92 from Robby-/insp20-headers

[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 29d7eb5d5a2ad453e38b06c1fd90bfb61d89001f..1ecec735e0ac69ef00fd1556940f1692774253c3 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * 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 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *         the file COPYING for details.
+ * 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"
 #include "u_listmode.h"
 
@@ -27,94 +37,78 @@
  * Now supports CIDR and IP addresses -- Brain
  */
 
-class InspIRCd* ServerInstance;
-
 /** Handles channel mode +I
  */
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+       InviteException(Module* Creator) : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
        InviteException ie;
 public:
-       ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me, this)
+       ModuleInviteException() : ie(this)
        {
                if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
                ie.DoImplements(this);
-               Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
        }
 
-       virtual ModResult OnCheckInvite(User* user, Channel* chan)
+       ModResult OnCheckInvite(User* user, Channel* chan)
        {
                if(chan != NULL)
                {
-                       modelist* list;
-                       chan->GetExt(ie.GetInfoKey(), list);
+                       modelist* list = ie.extItem.get(chan);
                        if (list)
                        {
-                               std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
-                                       if(InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
+                                       if (chan->CheckBan(user, it->mask))
                                        {
-                                               // They match an entry on the list, so let them in.
-                                               return MOD_RES_DENY;
+                                               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 MOD_RES_PASSTHRU;
        }
 
-       virtual const char* OnRequest(Request* request)
+       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
        {
-               return ie.DoOnRequest(request);
+               if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true))
+                       return OnCheckInvite(user, chan);
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnCleanup(int target_type, void* item)
+       void OnCleanup(int target_type, void* item)
        {
                ie.DoCleanup(target_type, item);
        }
 
-       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                ie.DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual void OnChannelDelete(Channel* chan)
-       {
-               ie.DoChannelDelete(chan);
-       }
-
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user)
        {
                ie.DoRehash();
        }
 
-       virtual Version GetVersion()
-       {
-               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
-       }
-
-       ~ModuleInviteException()
+       Version GetVersion()
        {
-               ServerInstance->Modes->DelMode(&ie);
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +I channel mode", VF_VENDOR);
        }
 };