X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=0cd03a08b801c832321227b5e8c380b9c621cd22;hb=b7e299c2e10d915d5e59df4cb3f54951c8daa999;hp=d36d23c68ce4fc1bec97c22849a5d8ef23aac4a5;hpb=8c14f0f530c61fd4875131902937fba9f780adf7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index d36d23c68..0cd03a08b 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -11,13 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "inspircd.h"
 #include "u_listmode.h"
 #include "wildcard.h"
 
@@ -49,7 +47,7 @@ class ModuleBanException : public Module
 
 public:
 	ModuleBanException(InspIRCd* Me)
-	: Module::Module(Me)
+	: Module(Me)
 	{
 		be = new BanException(ServerInstance);
 		if (!ServerInstance->AddMode(be, 'e'))
@@ -60,7 +58,7 @@ public:
 	virtual void Implements(char* List)
 	{
 		be->DoImplements(List);
-		List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+		List[I_OnRehash] = List[I_OnRequest] = List[I_On005Numeric] = List[I_OnCheckBan] = 1;
 	}
 	
 	virtual void On005Numeric(std::string &output)
@@ -81,7 +79,7 @@ public:
 				snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
 				for (modelist::iterator it = list->begin(); it != list->end(); it++)
 				{
-					if (ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask) || (match(mask, it->mask.c_str(), true)))
+					if (match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
 					{
 						// They match an entry on the list, so let them in.
 						return 1;
@@ -114,12 +112,12 @@ public:
 		be->DoRehash();
 	}
 
-        virtual char* OnRequest(Request* request)
+	virtual char* OnRequest(Request* request)
 	{
 		ListModeRequest* LM = (ListModeRequest*)request;
 		if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
 		{
-                        modelist* list;
+			modelist* list;
 			LM->chan->GetExt(be->GetInfoKey(), list);
 			if (list)
 			{
@@ -127,8 +125,7 @@ public:
 				snprintf(mask, MAXBUF, "%s!%s@%s", LM->user->nick, LM->user->ident, LM->user->GetIPString());
 				for (modelist::iterator it = list->begin(); it != list->end(); it++)
 				{
-					if (ServerInstance->MatchText(LM->user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(LM->user->GetFullHost(), it->mask) ||
-							(match(mask, it->mask.c_str(), true)))
+					if (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
 					{
 						// They match an entry
 						return (char*)it->mask.c_str();
@@ -153,25 +150,4 @@ public:
 	}
 };
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleBanExceptionFactory()
-	{
-	}
-	
-	~ModuleBanExceptionFactory()
-	{
-	}
-	
-	virtual Module* CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBanException(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)