X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=5f2f6f92a68f44b74c53e748c6f28dd67bc5a2e6;hb=3382adb9e9a79748b4db09bb41a296861800fa2d;hp=113af0b6b687d5abd7d84030b446572ad0a7b473;hpb=793d2364d907a73918eef1166b60f964ed0d384b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 113af0b6b..5f2f6f92a 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -5,7 +5,8 @@
 #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 */
@@ -17,23 +18,26 @@
 // 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
 
+
+
 class BanException : public ListModeBase
 {
  public:
-	BanException(Server* serv) : ListModeBase(serv, 'e', "End of Channel Exception List", "348", "349") { }
+	BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
 };
 
 
 class ModuleBanException : public Module
 {
 	BanException* be;
-	Server* Srv;
+	
 
 public:
-	ModuleBanException(Server* serv) : Module(serv)
+	ModuleBanException(InspIRCd* Me)
+	: Module::Module(Me)
 	{
-		be = new BanException(serv);
-		Srv = serv;
+		be = new BanException(ServerInstance);
+		ServerInstance->AddMode(be, 'e');
 	}
 	
 	virtual void Implements(char* List)
@@ -45,20 +49,19 @@ public:
 	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(be->GetInfoKey());
-			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;
@@ -92,6 +95,11 @@ public:
 	{
 		return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
 	}
+	
+	virtual ~ModuleBanException()
+	{
+		DELETE(be);	
+	}
 };
 
 class ModuleBanExceptionFactory : public ModuleFactory
@@ -105,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);
 	}
-	
 };