Remove InspIRCd* parameters and fields

[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 6ee4d917604d8e8020029ab076d506547603604b..e39064ca7e2c7db9894fe6648ed6eb59870a8067 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -2,62 +2,48 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "wildcard.h"
-#include "dns.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
-static Server *Srv;
-extern user_hash clientlist;
-        
-class cmd_tline : public command_t
+/** Handle /TLINE
+ */
+class CommandTline : public Command
 {
  public:
-       cmd_tline () : command_t("TLINE", 'o', 1)
+       CommandTline(Module* Creator) : Command(Creator,"TLINE", 1)
        {
-               this->source = "m_tline.so";
-               this->syntax = "<mask>";
+               flags_needed = 'o'; this->syntax = "<mask>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, 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 = clientlist.begin(); u != clientlist.end(); u++)
+               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++;
                        }
                        else
                        {
-                               char host[MAXBUF];
-                               sprintf(host, "%s@%s", u->second->ident, u->second->GetIPString());
-                               if (match(host, parameters[0], true))
+                               std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
+                               if (InspIRCd::MatchCIDR(host, parameters[0]))
                                {
                                        n_matched++;
                                        n_match_ip++;
@@ -65,61 +51,34 @@ class cmd_tline : public command_t
                        }
                }
                if (n_matched)
-                       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);
+                       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.c_str(), n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*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]);
-                       
+                       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_SUCCESS;
        }
 };
 
 class ModuleTLine : public Module
 {
-       cmd_tline* newcommand;
+       CommandTline cmd;
  public:
-       ModuleTLine(Server* Me)
-               : Module::Module(Me)
+       ModuleTLine()
+               : cmd(this)
        {
-               Srv = Me;
-               newcommand = new cmd_tline();
-               Srv->AddCommand(newcommand);
+               ServerInstance->AddCommand(&cmd);
        }
 
-       void Implements(char* List)
-       {
-       }
 
        virtual ~ModuleTLine()
        {
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-       }
-};
 
-
-class ModuleTLineFactory : public ModuleFactory
-{
- public:
-       ModuleTLineFactory()
-       {
-       }
-       
-       ~ModuleTLineFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleTLine(Me);
+               return Version("Provides /tline command used to test who a mask matches", VF_VENDOR,API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTLineFactory;
-}
+MODULE_INIT(ModuleTLine)