X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=5acdf4f97f63e0872f75b34c7f6bb88780163d45;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=f3e278e98a620a3a9e24a927779ece2c6287c567;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index f3e278e98..5acdf4f97 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-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.
@@ -17,52 +24,51 @@
  * 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, Server* serv) : ListModeBase(Instance, serv, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+	InviteException(InspIRCd* Instance) : ListModeBase(Instance, '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(InspIRCd* Me) : Module(Me), ie(Me)
 	{
-		ie = new InviteException(ServerInstance, serv);
-		Srv = serv;
-		Srv->AddMode(ie, 'I');
-	}
-	
-	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!");
+		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");
-		ServerInstance->ModeGrok->InsertMode(output, "I", 1);
 	}
-	 
-	virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+	virtual int OnCheckInvite(User* user, Channel* chan)
 	{
 		if(chan != NULL)
 		{
 			modelist* list;
-			chan->GetExt(ie->GetInfoKey(), 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;
@@ -72,56 +78,44 @@ 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 void OnCleanup(int target_type, void* item)
+	virtual const char* OnRequest(Request* request)
 	{
-		ie->DoCleanup(target_type, item);
+		return ie.DoOnRequest(request);
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnCleanup(int target_type, void* item)
 	{
-		ie->DoSyncChannel(chan, proto, opaque);
+		ie.DoCleanup(target_type, item);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual 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()
+	virtual void OnChannelDelete(Channel* chan)
 	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+		ie.DoChannelDelete(chan);
 	}
-};
-
 
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
+	virtual void OnRehash(User* user)
 	{
+		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);
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)