X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=e704b0223c54101ff7e11e5f1ff81b3b240e15c7;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=2c9bdee794becc78b8fe714b94d5d60217472aff;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 2c9bdee79..e704b0223 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -5,7 +5,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
@@ -18,8 +18,9 @@
 // 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;
 
+/** Handles +e channel mode
+ */
 class BanException : public ListModeBase
 {
  public:
@@ -30,14 +31,14 @@ class BanException : public ListModeBase
 class ModuleBanException : public Module
 {
 	BanException* be;
-	Server* Srv;
+	
 
 public:
 	ModuleBanException(InspIRCd* Me)
 	: Module::Module(Me)
 	{
 		be = new BanException(ServerInstance);
-		Srv->AddMode(be, 'e');
+		ServerInstance->AddMode(be, 'e');
 	}
 	
 	virtual void Implements(char* List)
@@ -49,7 +50,6 @@ public:
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" EXCEPTS=e");
-		ServerInstance->ModeGrok->InsertMode(output, "e", 1);
 	}
 
 	virtual int OnCheckBan(userrec* user, chanrec* chan)
@@ -62,7 +62,7 @@ public:
 			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;
@@ -94,11 +94,12 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
+		return Version(1, 0, 0, 3, VF_COMMON | VF_VENDOR);
 	}
 	
 	virtual ~ModuleBanException()
 	{
+		ServerInstance->Modes->DelMode(be);
 		DELETE(be);	
 	}
 };