In the grand tradition of huge fucking commits:

[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 65167cece00253786f58ec0713891370c71d5394..c246cc811ed2651b3b9448d754c2fbf77c06891f 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -11,35 +11,30 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "wildcard.h"
 #include "inspircd.h"
-#include "dns.h"
+#include "wildcard.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
 /** Handle /TLINE
  */ 
-class cmd_tline : public command_t
+class cmd_tline : public Command
 {
  public:
-       cmd_tline (InspIRCd* Instance) : command_t(Instance,"TLINE", 'o', 1)
+       cmd_tline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
        {
                this->source = "m_tline.so";
                this->syntax = "<mask>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                float n_counted = 0;
                float n_matched = 0;
                float n_match_host = 0;
                float n_match_ip = 0;
 
-               for (user_hash::const_iterator u = ServerInstance->clientlist.begin(); u != ServerInstance->clientlist.end(); u++)
+               for (user_hash::const_iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
                {
                        n_counted++;
                        if (match(u->second->GetFullRealHost(),parameters[0]))
@@ -63,8 +58,7 @@ class cmd_tline : public command_t
                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;
-                       
+               return CMD_LOCALONLY;                   
        }
 };
 
@@ -73,7 +67,7 @@ class ModuleTLine : public Module
        cmd_tline* newcommand;
  public:
        ModuleTLine(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                newcommand = new cmd_tline(ServerInstance);
@@ -94,28 +88,5 @@ class ModuleTLine : public Module
        }
 };
 
-
-class ModuleTLineFactory : public ModuleFactory
-{
- public:
-       ModuleTLineFactory()
-       {
-       }
-       
-       ~ModuleTLineFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTLine(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTLineFactory;
-}
+MODULE_INIT(ModuleTLine)