The module hook is kinda required.

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

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 81354609f2c751a7a952d202c753a5e94dc6b27c..1f142014ef71fe398905467edb3a7dbc8e14b80a 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
 
@@ -107,7 +106,7 @@ class CommandCheck : public Command
 
                        user->WriteServ(checkstr + " modes " + targchan->ChanModes(true));
                        user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
-                       
+
                        /* now the ugly bit, spool current members of a channel. :| */
 
                        CUList *ulist= targchan->GetUsers();
@@ -131,13 +130,13 @@ class CommandCheck : public Command
                        /* hostname or other */
                        for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
                        {
-                               if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0]))
+                               if (InspIRCd::Match(a->second->host, parameters[0]) || InspIRCd::Match(a->second->dhost, parameters[0]))
                                {
                                        /* host or vhost matches mask */
                                        user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
                                }
                                /* IP address */
-                               else if (match(a->second->GetIPString(), parameters[0], true))
+                               else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
                                {
                                        /* same IP. */
                                        user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
@@ -161,22 +160,22 @@ class ModuleCheck : public Module
  public:
        ModuleCheck(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new CommandCheck(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleCheck()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
-       
+
 };
 
 MODULE_INIT(ModuleCheck)