X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=1810f82971ba8b650d87cc028b3681be66f87f72;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=06ce93a579d53715590138c1f3a3497b8ef68bb6;hpb=9488d9c5cb9d2d541479002e49f6003f18158962;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 06ce93a57..1810f8297 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,50 +1,78 @@
-#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-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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
+ *
+ * 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
+ */
 
-/* Written by Om<om@inspircd.org>, April 2005. */
-/* Based on m_exception, which was originally based on m_chanprotect and m_silence */
+class InspIRCd* ServerInstance;
 
-// 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
+/** 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 ListModeBaseModule
+class ModuleInviteException : public Module
 {
+	InviteException* ie;
 public:
-	ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347")
+	ModuleInviteException(InspIRCd* Me) : Module(Me)
 	{
+		ie = new InviteException(ServerInstance);
+		if (!ServerInstance->AddMode(ie, 'I'))
+			throw ModuleException("Could not add new modes!");
+		ServerInstance->PublishInterface("ChannelBanList", this);
 	}
-	
+
 	virtual void Implements(char* List)
 	{
-		this->DoImplements(List);
-		List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+		ie->DoImplements(List);
+		List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
 	}
 	
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" INVEX=I");
-		output.insert(output.find("CHANMODES=", 0)+10, "I");
 	}
 	 
 	virtual int OnCheckInvite(userrec* user, chanrec* 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)
 			{
+				char mask[MAXBUF];
+				snprintf(mask, MAXBUF, "%s!%s@%s", 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(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
 					{
 						// They match an entry on the list, so let them in.
 						return 1;
@@ -56,34 +84,63 @@ public:
 
 		return 0;		
 	}
-		
-	virtual Version GetVersion()
+
+	virtual char* OnRequest(Request* request)
 	{
-		return Version(1, 0, 0, 2, VF_STATIC);
+		ListModeRequest* LM = (ListModeRequest*)request;
+		if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
+		{
+			modelist* list;
+			LM->chan->GetExt(ie->GetInfoKey(), list);
+			if (list)
+			{
+				char mask[MAXBUF];
+				snprintf(mask, MAXBUF, "%s!%s@%s", LM->user->nick, LM->user->ident, LM->user->GetIPString());
+				for (modelist::iterator it = list->begin(); it != list->end(); it++)
+				{
+					if (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+					{
+						// They match an entry
+						return (char*)it->mask.c_str();
+					}
+				}
+				return NULL;
+			}
+		}
+		return NULL;
 	}
-};
 
+	virtual void OnCleanup(int target_type, void* item)
+	{
+		ie->DoCleanup(target_type, item);
+	}
 
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
+	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
 	{
+		ie->DoSyncChannel(chan, proto, opaque);
 	}
-	
-	~ModuleInviteExceptionFactory()
+
+	virtual void OnChannelDelete(chanrec* chan)
 	{
+		ie->DoChannelDelete(chan);
 	}
-	
-	virtual Module * CreateModule(Server* serv)
+
+	virtual void OnRehash(userrec* user, const std::string &param)
 	{
-		return new ModuleInviteException(serv);
+		ie->DoRehash();
+	}
+		
+	virtual Version GetVersion()
+	{
+		return Version(1, 1, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
 	}
-	
-};
 
+	~ModuleInviteException()
+	{
+		ServerInstance->Modes->DelMode(ie);
+		DELETE(ie);
+		ServerInstance->UnpublishInterface("ChannelBanList", this);
+	}
+};
 
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)