X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=1ecec735e0ac69ef00fd1556940f1692774253c3;hb=553a8da754c8cd308bad2008018849714e70f9b7;hp=5232cfa94d7c43873f93e12a65303f094a14fa24;hpb=f16ef27e0e5df0249ecb38f7adf76735a550ad0a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 5232cfa94..1ecec735e 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,14 +1,31 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-#include "helperfuncs.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 "inspircd.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
+/* $ModDep: ../../include/u_listmode.h */
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
@@ -17,108 +34,82 @@
  * 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
  */
 
+/** Handles channel mode +I
+ */
 class InviteException : public ListModeBase
 {
  public:
-	InviteException(Server* serv) : ListModeBase(serv, '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;
-	Server* Srv;
-
+	InviteException ie;
 public:
-	ModuleInviteException(Server* serv) : Module(serv)
+	ModuleInviteException() : ie(this)
 	{
-		ie = new InviteException(serv);
-		Srv = serv;
-	}
-	
-	virtual void Implements(char* List)
-	{
-		ie->DoImplements(List);
-		List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+		if (!ServerInstance->Modes->AddMode(&ie))
+			throw ModuleException("Could not add new modes!");
+
+		ie.DoImplements(this);
+		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");
-		InsertMode(output, "I", 1);
 	}
-	 
-	virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+	ModResult OnCheckInvite(User* user, Channel* chan)
 	{
 		if(chan != NULL)
 		{
-			modelist* list = (modelist*)chan->GetExt(ie->GetInfoKey());
-			Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions");
+			modelist* list = ie.extItem.get(chan);
 			if (list)
 			{
 				for (modelist::iterator it = list->begin(); it != list->end(); it++)
 				{
-					if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+					if (chan->CheckBan(user, it->mask))
 					{
-						// 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;		
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
+	ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
 	{
-		ie->DoCleanup(target_type, item);
+		if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true))
+			return OnCheckInvite(user, chan);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	void OnCleanup(int target_type, void* item)
 	{
-		ie->DoSyncChannel(chan, proto, opaque);
+		ie.DoCleanup(target_type, item);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		ie->DoChannelDelete(chan);
+		ie.DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnRehash(const std::string &param)
-	{
-		ie->DoRehash();
-	}
-		
-	virtual Version GetVersion()
+	void OnRehash(User* user)
 	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+		ie.DoRehash();
 	}
-};
 
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
+	Version GetVersion()
 	{
+		return Version("Provides support for the +I channel mode", VF_VENDOR);
 	}
-	
-	~ModuleInviteExceptionFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* serv)
-	{
-		return new ModuleInviteException(serv);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)