X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=6229e1fa2fac06495210048034962468f47b7f62;hb=f471083cd0519d47c7c7a09029813ede41994f7b;hp=234f7bfbc36c41a590b188ebeb759a65afa0925c;hpb=3382adb9e9a79748b4db09bb41a296861800fa2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 234f7bfbc..6229e1fa2 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,14 +1,28 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
+/*
+ * 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>
+ *
+ * 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/>.
+ */
 
-#include "u_listmode.h"
 
-/* $ModDesc: Provides support for the +I channel mode */
+#include "inspircd.h"
+#include "listmode.h"
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
@@ -17,109 +31,65 @@
  * 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
+ * Now supports CIDR and IP addresses -- Brain
  */
 
-class InspIRCd* ServerInstance;
-
+/** Handles channel mode +I
+ */
 class InviteException : public ListModeBase
 {
  public:
-	InviteException(InspIRCd* Instance) : ListModeBase(Instance, '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;
-	
-
+	bool invite_bypass_key;
+	InviteException ie;
 public:
-	ModuleInviteException(InspIRCd* Me) : Module(Me)
-	{
-		ie = new InviteException(ServerInstance);
-		ServerInstance->AddMode(ie, 'I');
-	}
-	
-	virtual void Implements(char* List)
+	ModuleInviteException() : ie(this)
 	{
-		ie->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");
+		tokens["INVEX"] = "I";
 	}
-	 
-	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;
-			chan->GetExt(ie->GetInfoKey(), list);
-			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(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()))
-					{
-						// 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;		
-	}
-
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		ie->DoCleanup(target_type, item);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE
 	{
-		ie->DoSyncChannel(chan, proto, opaque);
+		if (invite_bypass_key)
+			return OnCheckInvite(user, chan);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ie->DoChannelDelete(chan);
+		invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true);
+		ie.DoRehash();
 	}
 
-	virtual void OnRehash(const std::string &param)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		ie->DoRehash();
-	}
-		
-	virtual Version GetVersion()
-	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+		return Version("Provides support for the +I channel mode", VF_VENDOR);
 	}
 };
 
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
-	{
-	}
-	
-	~ModuleInviteExceptionFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleInviteException(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)