X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=5e6628e6d859dc27f36f138386905e9397745c5e;hb=6c2edc2c5ab07a1fa8c32d3fa9abd6b9149b804c;hp=91f4e22c8acfacc7ac84f80687c5ca9453b5f9a6;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 91f4e22c8..5e6628e6d 100644
--- 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"
 
@@ -32,22 +42,23 @@
 class InviteException : public ListModeBase
 {
  public:
-	InviteException(Module* Creator) : ListModeBase(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
 {
+	bool invite_bypass_key;
 	InviteException ie;
 public:
 	ModuleInviteException() : ie(this)
 	{
 		if (!ServerInstance->Modes->AddMode(&ie))
 			throw ModuleException("Could not add new modes!");
-		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
+		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, 4);
 	}
 
 	void On005Numeric(std::string &output)
@@ -57,26 +68,28 @@ 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++)
 			{
-				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))
 				{
-					if (chan->CheckBan(user, it->mask))
-					{
-						return MOD_RES_ALLOW;
-					}
+					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;
 	}
 
+	ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
+	{
+		if (invite_bypass_key)
+			return OnCheckInvite(user, chan);
+		return MOD_RES_PASSTHRU;
+	}
+
 	void OnCleanup(int target_type, void* item)
 	{
 		ie.DoCleanup(target_type, item);
@@ -89,17 +102,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, API_VERSION);
-	}
-
-	~ModuleInviteException()
-	{
-		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+		return Version("Provides support for the +I channel mode", VF_VENDOR);
 	}
 };