X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=747a3b30a53be2512bf01a80e4520ec0dea8cb8e;hb=3f782d5cad84165d695203977c75d2a3877f4644;hp=33c82fa0a2490772ba9fb56e12f143e5309085ed;hpb=9f6ad08f77912bcce3c22c31744586d811631d92;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 33c82fa0a..747a3b30a 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -52,13 +52,16 @@ 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)
@@ -68,17 +71,14 @@ public:
 
 	ModResult OnCheckInvite(User* user, Channel* chan)
 	{
-		if(chan != NULL)
+		modelist* list = ie.extItem.get(chan);
+		if (list)
 		{
-			modelist* list = ie.extItem.get(chan);
-			if (list)
+			for (modelist::iterator it = list->begin(); it != list->end(); it++)
 			{
-				for (modelist::iterator it = list->begin(); it != list->end(); it++)
+				if (chan->CheckBan(user, it->mask))
 				{
-					if (chan->CheckBan(user, it->mask))
-					{
-						return MOD_RES_ALLOW;
-					}
+					return MOD_RES_ALLOW;
 				}
 			}
 		}
@@ -93,11 +93,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);