X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=5f2f6f92a68f44b74c53e748c6f28dd67bc5a2e6;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=fa0ff4c1d360c6d51fe5a81ae23cccf65a8d0726;hpb=392c7828b21d2b0664ec705e99969f54fdaa5566;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index fa0ff4c1d..5f2f6f92a 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -4,7 +4,9 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "mode.h"
+
+#include "inspircd.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
@@ -17,36 +19,49 @@
 // and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them
 
 
-class ModuleBanException : public ListModeBaseModule
+
+class BanException : public ListModeBase
+{
+ public:
+	BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
+};
+
+
+class ModuleBanException : public Module
 {
+	BanException* be;
+	
+
 public:
-	ModuleBanException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'e', "End of Channel Exception List", "348", "349")
+	ModuleBanException(InspIRCd* Me)
+	: Module::Module(Me)
 	{
+		be = new BanException(ServerInstance);
+		ServerInstance->AddMode(be, 'e');
 	}
 	
 	virtual void Implements(char* List)
 	{
-		this->DoImplements(List);
+		be->DoImplements(List);
 		List[I_On005Numeric] = List[I_OnCheckBan] = 1;
 	}
 	
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" EXCEPTS=e");
-		InsertMode(output, "e", 1);
 	}
 
 	virtual int OnCheckBan(userrec* user, chanrec* chan)
 	{
 		if(chan != NULL)
 		{
-			modelist* list = (modelist*)chan->GetExt(infokey);
-			Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions");
+			modelist* list;
+			chan->GetExt(be->GetInfoKey(), list);
 			
 			if(list)
 			{
 				for (modelist::iterator it = list->begin(); it != list->end(); it++)
-					if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+					if(ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask))
 						// They match an entry on the list, so let them in.
 						return 1;
 				return 0;
@@ -55,11 +70,36 @@ public:
 		}
 		return 0;	
 	}
+
+	virtual void OnCleanup(int target_type, void* item)
+	{
+		be->DoCleanup(target_type, item);
+	}
+
+	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	{
+		be->DoSyncChannel(chan, proto, opaque);
+	}
+
+	virtual void OnChannelDelete(chanrec* chan)
+	{
+		be->DoChannelDelete(chan);
+	}
+
+	virtual void OnRehash(const std::string &param)
+	{
+		be->DoRehash();
+	}
 	
 	virtual Version GetVersion()
 	{
 		return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
 	}
+	
+	virtual ~ModuleBanException()
+	{
+		DELETE(be);	
+	}
 };
 
 class ModuleBanExceptionFactory : public ModuleFactory
@@ -73,11 +113,10 @@ class ModuleBanExceptionFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module* CreateModule(Server* serv)
+	virtual Module* CreateModule(InspIRCd* Me)
 	{
-		return new ModuleBanException(serv);
+		return new ModuleBanException(Me);
 	}
-	
 };