MetaData rework

[user/henk/code/inspircd.git] / src / modules / m_tline.cpp

diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 31bd67e1716813641164aea6b451164f7e324a6f..2ce4692bb8b8b76a6420ed3abedcd84cdecbbab7 100644 (file)
--- 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,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
@@ -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++;
@@ -63,15 +62,12 @@ class CommandTline : public Command
 
 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);
        }
 
 
@@ -81,7 +77,7 @@ class ModuleTLine : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR,API_VERSION);
        }
 };