X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_tline.cpp;h=2ce4692bb8b8b76a6420ed3abedcd84cdecbbab7;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;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..2ce4692bb 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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,31 +56,28 @@ 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;
 	}
 };
 
 class ModuleTLine : public Module
 {
-	CommandTline* newcommand;
+	CommandTline cmd;
  public:
 	ModuleTLine(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cmd(Me)
 	{
-		
-		newcommand = new CommandTline(ServerInstance);
-		ServerInstance->AddCommand(newcommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
 
 
 	virtual ~ModuleTLine()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR,API_VERSION);
 	}
 };