X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=58c02dcd200f1fd1a2a6ec4a6299b57f3adefeb8;hb=65627cc9d9f3227ea6dc091dd62a71fbce41a5e2;hp=d5cb15ea5c0f5aec347ccf4d8a433e84046d6256;hpb=5bfd172ec5225e9af1ebb273158993dd589b1cc0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index d5cb15ea5..58c02dcd2 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,14 +1,21 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 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.
@@ -17,49 +24,52 @@
  * 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(Server* serv) : ListModeBase(serv, 'I', "End of Channel Invite Exception List", "346", "347") { }
+	InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
 	InviteException* ie;
-	Server* Srv;
-
 public:
-	ModuleInviteException(Server* serv) : Module(serv)
-	{
-		ie = new InviteException(serv);
-		Srv = serv;
-	}
-	
-	virtual void Implements(char* List)
+	ModuleInviteException(InspIRCd* Me) : Module(Me)
 	{
-		ie->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(ie->GetInfoKey());
-			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;
@@ -69,7 +79,12 @@ 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 const char* OnRequest(Request* request)
+	{
+		return ie->DoOnRequest(request);
 	}
 
 	virtual void OnCleanup(int target_type, void* item)
@@ -77,48 +92,32 @@ public:
 		ie->DoCleanup(target_type, item);
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		ie->DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		ie->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		ie->DoRehash();
 	}
-		
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
-};
 
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
+	~ModuleInviteException()
 	{
+		ServerInstance->Modes->DelMode(ie);
+		delete ie;
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
-	
-	~ModuleInviteExceptionFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* serv)
-	{
-		return new ModuleInviteException(serv);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)