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

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 0c56edd7e..5f2f6f92a 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,27 +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
 
-extern InspIRCd* ServerInstance;
+
 
 class BanException : public ListModeBase
 {
  public:
-	BanException(InspIRCd* Instance, Server* serv) : ListModeBase(Instance, serv, 'e', "End of Channel Exception List", "348", "349", true) { }
+	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::Module(serv)
+	ModuleBanException(InspIRCd* Me)
+	: Module::Module(Me)
 	{
-		be = new BanException(ServerInstance, serv);
-		Srv = serv;
-		Srv->AddMode(be, 'e');
+		be = new BanException(ServerInstance);
+		ServerInstance->AddMode(be, 'e');
 	}
 	
 	virtual void Implements(char* List)
@@ -50,7 +49,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)
@@ -63,7 +61,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;
@@ -115,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);
 	}
-	
 };