X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=0c56edd7e3e81ec35fd08a82a8bb264655e1a706;hb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;hp=7d99e1f4799a704a43999296ab7337d54729fb5c;hpb=a8d1eab5462e704ccc10e143df54d3136fd5a5cc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 7d99e1f47..0c56edd7e 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 "mode.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
@@ -16,32 +18,47 @@
 // The +e channel mode takes a nick!ident@host, glob patterns allowed,
 // and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them
 
+extern InspIRCd* ServerInstance;
 
-class ModuleBanException : public ListModeBaseModule
+class BanException : public ListModeBase
 {
+ public:
+	BanException(InspIRCd* Instance, Server* serv) : ListModeBase(Instance, serv, 'e', "End of Channel Exception List", "348", "349", true) { }
+};
+
+
+class ModuleBanException : public Module
+{
+	BanException* be;
+	Server* Srv;
+
 public:
-	ModuleBanException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'e', "End of Channel Exception List", "348", "349")
+	ModuleBanException(Server* serv)
+	: Module::Module(serv)
 	{
+		be = new BanException(ServerInstance, serv);
+		Srv = serv;
+		Srv->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");
-		output.insert(output.find("CHANMODES=", 0)+10, "e");
+		output.append(" EXCEPTS=e");
+		ServerInstance->ModeGrok->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)
 			{
@@ -55,10 +72,35 @@ 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, 2, VF_STATIC);
+		return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
+	}
+	
+	virtual ~ModuleBanException()
+	{
+		DELETE(be);	
 	}
 };