A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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..37437b5fd810d20c7a15305bf4db3b80474a759c 100644 (file)
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -2,51 +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-2007 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 "inspircd.h"
 #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;
-        
+/** Handle /TLINE
+ */ 
 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;
                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]))
@@ -57,7 +48,7 @@ class cmd_tline : public command_t
                        else
                        {
                                char host[MAXBUF];
-                               sprintf(host, "%s@%s", u->second->ident, u->second->GetIPString());
+                               snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
                                if (match(host, parameters[0], true))
                                {
                                        n_matched++;
@@ -66,9 +57,11 @@ 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], 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]);
+
+               return CMD_FAILURE;
                        
        }
 };
@@ -78,11 +71,11 @@ class ModuleTLine : public Module
        cmd_tline* newcommand;
  public:
        ModuleTLine(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
-               newcommand = new cmd_tline();
-               Srv->AddCommand(newcommand);
+               newcommand = new cmd_tline(ServerInstance);
+               ServerInstance->AddCommand(newcommand);
        }
 
        void Implements(char* List)
@@ -95,7 +88,7 @@ class ModuleTLine : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR,API_VERSION);
        }
 };
 
@@ -119,7 +112,7 @@ class ModuleTLineFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleTLineFactory;
 }