X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=e3c243f84237ab83730d033d511c2d5330ec9b8e;hb=97c0e6b4c4e304a1c4e764fc06a7e2663a41743d;hp=b3104d3d2dfcdf5f26a68476e623c4716c8613ef;hpb=392c7828b21d2b0664ec705e99969f54fdaa5566;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index b3104d3d2..e3c243f84 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,50 +1,75 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *	    the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#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. */
-/* Based on m_exception, which was originally based on m_chanprotect and m_silence */
+/*
+ * Written by Om <om@inspircd.org>, April 2005.
+ * Based on m_exception, which was originally based on m_chanprotect and m_silence
+ *
+ * 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
+ */
 
-// 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
+class InspIRCd* ServerInstance;
 
-class ModuleInviteException : public ListModeBaseModule
+/** Handles channel mode +I
+ */
+class InviteException : public ListModeBase
 {
+ public:
+	InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+};
+
+class ModuleInviteException : public Module
+{
+	InviteException* ie;
 public:
-	ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347")
-	{
-	}
-	
-	virtual void Implements(char* List)
+	ModuleInviteException(InspIRCd* Me) : Module(Me)
 	{
-		this->DoImplements(List);
-		List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+		ie = new InviteException(ServerInstance);
+		if (!ServerInstance->Modes->AddMode(ie))
+			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+		ie->DoImplements(this);
+		Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
-	
+
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" INVEX=I");
-		InsertMode(output, "I", 1);
 	}
-	 
-	virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+	virtual int OnCheckInvite(User* user, Channel* chan)
 	{
 		if(chan != NULL)
 		{
-			modelist* list = (modelist*)chan->GetExt(infokey);
-			Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions");
+			modelist* list;
+			chan->GetExt(ie->GetInfoKey(), list);
 			if (list)
 			{
+				std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
 				for (modelist::iterator it = list->begin(); it != list->end(); it++)
 				{
-					if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+					if(InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
 					{
 						// They match an entry on the list, so let them in.
 						return 1;
@@ -54,36 +79,45 @@ public:
 			// 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 0;
 	}
-		
-	virtual Version GetVersion()
+
+	virtual const char* OnRequest(Request* request)
 	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+		return ie->DoOnRequest(request);
+	}
+
+	virtual void OnCleanup(int target_type, void* item)
+	{
+		ie->DoCleanup(target_type, item);
 	}
-};
 
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+	{
+		ie->DoSyncChannel(chan, proto, opaque);
+	}
 
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
+	virtual void OnChannelDelete(Channel* chan)
+	{
+		ie->DoChannelDelete(chan);
+	}
+
+	virtual void OnRehash(User* user, const std::string &param)
 	{
+		ie->DoRehash();
 	}
-	
-	~ModuleInviteExceptionFactory()
+
+	virtual Version GetVersion()
 	{
+		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
-	
-	virtual Module * CreateModule(Server* serv)
+
+	~ModuleInviteException()
 	{
-		return new ModuleInviteException(serv);
+		ServerInstance->Modes->DelMode(ie);
+		delete ie;
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)