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 7fe7d40dccc261fb790f5d2c865bff5bd06fec29..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"
 
@@ -43,11 +53,10 @@ public:
        {
                if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
                ie.DoImplements(this);
-               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        void On005Numeric(std::string &output)
@@ -62,7 +71,6 @@ public:
                        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 (chan->CheckBan(user, it->mask))
@@ -71,12 +79,18 @@ public:
                                        }
                                }
                        }
-                       // 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;
        }
 
+       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
+       {
+               if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true))
+                       return OnCheckInvite(user, chan);
+               return MOD_RES_PASSTHRU;
+       }
+
        void OnCleanup(int target_type, void* item)
        {
                ie.DoCleanup(target_type, item);
@@ -94,12 +108,7 @@ public:
 
        Version GetVersion()
        {
-               return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON, API_VERSION);
-       }
-
-       ~ModuleInviteException()
-       {
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +I channel mode", VF_VENDOR);
        }
 };