X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=2e6f6db6533f98ea5cc7384ee73c5612f87e3448;hb=3cf993500544c2157992650da2487bfa89be405d;hp=51a489de08af190288c1c12172b43f2e7336d7b9;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 51a489de0..2e6f6db65 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-2010 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,110 +24,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
  */
 
-class InspIRCd* ServerInstance;
-
+/** Handles channel mode +I
+ */
 class InviteException : public ListModeBase
 {
  public:
-	InviteException(InspIRCd* Instance) : ListModeBase(Instance, '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(InspIRCd* Me) : Module(Me)
-	{
-		ie = new InviteException(ServerInstance);
-		Srv->AddMode(ie, 'I');
-	}
-	
-	virtual void Implements(char* List)
+	ModuleInviteException() : ie(this)
 	{
-		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");
-		ServerInstance->ModeGrok->InsertMode(output, "I", 1);
 	}
-	 
-	virtual int OnCheckInvite(userrec* user, chanrec* chan)
+
+	ModResult OnCheckInvite(User* user, Channel* chan)
 	{
 		if(chan != NULL)
 		{
-			modelist* list;
-			chan->GetExt(ie->GetInfoKey(), list);
+			modelist* list = ie.extItem.get(chan);
 			if (list)
 			{
 				for (modelist::iterator it = list->begin(); it != list->end(); it++)
 				{
-					if(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()))
+					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)
+	void OnRehash(User* user)
 	{
-		ie->DoRehash();
+		ie.DoRehash();
 	}
-		
-	virtual Version GetVersion()
-	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
-	}
-};
 
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleInviteExceptionFactory()
+	Version GetVersion()
 	{
+		return Version("Provides support for the +I channel mode", VF_VENDOR);
 	}
-	
-	~ModuleInviteExceptionFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleInviteException(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)