Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

[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 47f82200eca5d70fd89f544a68a8208300af5e08..ccb560428038e05b91ba8dbc0a1f57828cd1a5bf 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -20,26 +20,26 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "wildcard.h"
 #include "inspircd.h"
 #include "dns.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
         
 class cmd_tline : public command_t
 {
  public:
-       cmd_tline () : command_t("TLINE", 'o', 1)
+       cmd_tline (InspIRCd* Instance) : command_t(Instance,"TLINE", 'o', 1)
        {
                this->source = "m_tline.so";
                this->syntax = "<mask>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                float n_counted = 0;
                float n_matched = 0;
@@ -69,6 +69,8 @@ class cmd_tline : public command_t
                        user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick, n_counted, parameters[0], n_matched, (n_counted/n_matched)*100, n_match_host, n_match_ip);
                else
                        user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick, n_counted, parameters[0]);
+
+               return CMD_FAILURE;
                        
        }
 };
@@ -77,12 +79,12 @@ class ModuleTLine : public Module
 {
        cmd_tline* newcommand;
  public:
-       ModuleTLine(Server* Me)
+       ModuleTLine(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               newcommand = new cmd_tline();
-               Srv->AddCommand(newcommand);
+               
+               newcommand = new cmd_tline(ServerInstance);
+               ServerInstance->AddCommand(newcommand);
        }
 
        void Implements(char* List)
@@ -95,7 +97,7 @@ class ModuleTLine : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_VENDOR);
        }
 };
 
@@ -111,7 +113,7 @@ class ModuleTLineFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleTLine(Me);
        }