X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=69498a94294142b7ce16b03978e564aae84bbc47;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=5e6628e6d859dc27f36f138386905e9397745c5e;hpb=404154826252d8a031d83ef5c098a8727d3fb6e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 5e6628e6d..69498a942 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -22,10 +22,9 @@
 
 
 #include "inspircd.h"
-#include "u_listmode.h"
+#include "listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
-/* $ModDep: ../../include/u_listmode.h */
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
@@ -52,26 +51,29 @@ class ModuleInviteException : public Module
 public:
 	ModuleInviteException() : ie(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&ie))
-			throw ModuleException("Could not add new modes!");
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(ie);
 
 		OnRehash(NULL);
 		ie.DoImplements(this);
 		Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		output.append(" INVEX=I");
+		tokens["INVEX"] = "I";
 	}
 
 	ModResult OnCheckInvite(User* user, Channel* chan)
 	{
-		modelist* list = ie.extItem.get(chan);
+		ListModeBase::ModeList* list = ie.GetList(chan);
 		if (list)
 		{
-			for (modelist::iterator it = list->begin(); it != list->end(); it++)
+			for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
 			{
 				if (chan->CheckBan(user, it->mask))
 				{
@@ -90,11 +92,6 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnCleanup(int target_type, void* item)
-	{
-		ie.DoCleanup(target_type, item);
-	}
-
 	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		ie.DoSyncChannel(chan, proto, opaque);