X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_tline.cpp;h=c249f3b3ba7f5ba8ad05bf8beac92b904822ab07;hb=31b232eec07d0b85ce2cc7c4ebc5d5387f781dcb;hp=79f9dff3c9dc99c45eeddc3104b0b947ea0c4e82;hpb=e3bd782207f50d131acd008b0cbcc7545aac7690;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 79f9dff3c..c249f3b3b 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -12,12 +12,11 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
 /** Handle /TLINE
- */ 
+ */
 class CommandTline : public Command
 {
  public:
@@ -37,7 +36,7 @@ class CommandTline : public Command
 		for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
 		{
 			n_counted++;
-			if (match(u->second->GetFullRealHost(),parameters[0]))
+			if (InspIRCd::Match(u->second->GetFullRealHost(),parameters[0]))
 			{
 				n_matched++;
 				n_match_host++;
@@ -45,7 +44,7 @@ class CommandTline : public Command
 			else
 			{
 				std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
-				if (match(host, parameters[0], true))
+				if (InspIRCd::MatchCIDR(host, parameters[0]))
 				{
 					n_matched++;
 					n_match_ip++;
@@ -57,7 +56,7 @@ class CommandTline : public Command
 		else
 			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str());
 
-		return CMD_LOCALONLY;			
+		return CMD_LOCALONLY;
 	}
 };
 
@@ -68,7 +67,7 @@ class ModuleTLine : public Module
 	ModuleTLine(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		newcommand = new CommandTline(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
 
@@ -78,7 +77,7 @@ class ModuleTLine : public Module
 	virtual ~ModuleTLine()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
 		return Version(1, 2, 0, 0, VF_VENDOR,API_VERSION);