Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

[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 b81a5237d52922ce02ef401bc4c4afa03e422af1..747a3b30a53be2512bf01a80e4520ec0dea8cb8e 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-2010 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"
 
@@ -37,16 +47,21 @@ class InviteException : public ListModeBase
 
 class ModuleInviteException : public Module
 {
+       bool invite_bypass_key;
        InviteException ie;
 public:
        ModuleInviteException() : ie(this)
        {
-               if (!ServerInstance->Modes->AddMode(&ie))
-                       throw ModuleException("Could not add new modes!");
+       }
 
+       void init()
+       {
+               ServerInstance->Modules->AddService(ie);
+
+               OnRehash(NULL);
                ie.DoImplements(this);
-               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void On005Numeric(std::string &output)
@@ -56,17 +71,14 @@ public:
 
        ModResult OnCheckInvite(User* user, Channel* chan)
        {
-               if(chan != NULL)
+               modelist* list = ie.extItem.get(chan);
+               if (list)
                {
-                       modelist* list = ie.extItem.get(chan);
-                       if (list)
+                       for (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 (chan->CheckBan(user, it->mask))
-                                       {
-                                               return MOD_RES_ALLOW;
-                                       }
+                                       return MOD_RES_ALLOW;
                                }
                        }
                }
@@ -74,9 +86,11 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       void OnCleanup(int target_type, void* item)
+       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
        {
-               ie.DoCleanup(target_type, item);
+               if (invite_bypass_key)
+                       return OnCheckInvite(user, chan);
+               return MOD_RES_PASSTHRU;
        }
 
        void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
@@ -86,12 +100,13 @@ public:
 
        void OnRehash(User* user)
        {
+               invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true);
                ie.DoRehash();
        }
 
        Version GetVersion()
        {
-               return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON);
+               return Version("Provides support for the +I channel mode", VF_VENDOR);
        }
 };