fix some unitialised vectors and tidy up a bit.

[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 b35ad6d10b0437c5a83932e66b32f46f0f501e19..7dc960c5a188aa52cbe7357d2aac0fc1dd950993 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -2,54 +2,42 @@
  *       | 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-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 "inspircd.h"
-#include "dns.h"
+#include "wildcard.h"
 
 /* $ModDesc: Provides /tline command used to test who a mask matches */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-        
-class cmd_tline : public command_t
+/** Handle /TLINE
+ */ 
+class CommandTline : public Command
 {
  public:
-       cmd_tline () : command_t("TLINE", 'o', 1)
+       CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", "o", 1)
        {
                this->source = "m_tline.so";
                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 = ServerInstance->clientlist.begin(); u != ServerInstance->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 (match(u->second->GetFullRealHost(),parameters[0].c_str()))
                        {
                                n_matched++;
                                n_match_host++;
@@ -57,8 +45,8 @@ class cmd_tline : public command_t
                        else
                        {
                                char host[MAXBUF];
-                               sprintf(host, "%s@%s", u->second->ident, u->second->GetIPString());
-                               if (match(host, parameters[0], true))
+                               snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
+                               if (match(host, parameters[0].c_str(), true))
                                {
                                        n_matched++;
                                        n_match_ip++;
@@ -66,61 +54,37 @@ 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, 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, n_counted, parameters[0].c_str());
+
+               return CMD_LOCALONLY;                   
        }
 };
 
 class ModuleTLine : public Module
 {
-       cmd_tline* newcommand;
+       CommandTline* newcommand;
  public:
        ModuleTLine(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
-               newcommand = new cmd_tline();
-               Srv->AddCommand(newcommand);
-       }
+               newcommand = new CommandTline(ServerInstance);
+               ServerInstance->AddCommand(newcommand);
 
-       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()
-       {
+               return Version(1, 2, 0, 0, VF_VENDOR,API_VERSION);
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTLine(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTLineFactory;
-}
+MODULE_INIT(ModuleTLine)