Revert automated conversion by Special, as it (unfortunately) neglects some details...

[user/henk/code/inspircd.git] / src / modules / m_clones.cpp

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 72a7ca7e832abc643480967e225139c182d055a3..82bdf55500ffb46a23c116c17f50d21ad55c6b0d 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,54 +12,43 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "wildcard.h"
 
-/* $ModDesc: Provides the /clones command to retrieve information on a user, channel, or IP address */
+/* $ModDesc: Provides the /clones command to retrieve information on clones. */
 
 /** Handle /CHECK
  */
-class cmd_clones : public command_t
+class CommandClones : public Command
 {
  public:
-       cmd_clones (InspIRCd* Instance) : command_t(Instance,"CLONES", 'o', 1)
+       CommandClones (InspIRCd* Instance) : Command(Instance,"CLONES", "o", 1)
        {
                this->source = "m_clones.so";
                syntax = "<limit>";
        }
 
-       std::string FindMatchingIP(const irc::string &ipaddr)
-       {
-               std::string n = assign(ipaddr);
-               for (user_hash::const_iterator a = ServerInstance->clientlist->begin(); a != ServerInstance->clientlist->end(); a++)
-                       if (a->second->GetIPString() == n)
-                               return a->second->GetFullRealHost();
-               return "<?>";
-       }
-
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
 
                std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES";
 
-               unsigned long limit = atoi(parameters[0]);
+               unsigned long limit = atoi(parameters[0].c_str());
 
                /*
                 * Syntax of a /clones reply:
                 *  :server.name 304 target :CLONES START
-                *  :server.name 304 target :CLONES <count> <ip> <fullhost>
+                *  :server.name 304 target :CLONES <count> <ip>
                 *  :server.name 304 target :CHECK END
                 */
 
                user->WriteServ(clonesstr + " START");
 
                /* hostname or other */
-               for (clonemap::iterator x = ServerInstance->global_clones.begin(); x != ServerInstance->global_clones.end(); x++)
+               // XXX I really don't like marking global_clones public for this. at all. -- w00t
+               for (clonemap::iterator x = ServerInstance->Users->global_clones.begin(); x != ServerInstance->Users->global_clones.end(); x++)
                {
                        if (x->second >= limit)
-                               user->WriteServ(clonesstr + " "+ ConvToStr(x->second) + " " + assign(x->first) + " " + FindMatchingIP(x->first));
+                               user->WriteServ(clonesstr + " "+ ConvToStr(x->second) + " " + assign(x->first));
                }
 
                user->WriteServ(clonesstr + " END");
@@ -72,29 +61,26 @@ class cmd_clones : public command_t
 class ModuleClones : public Module
 {
  private:
-       cmd_clones *mycommand;
+       CommandClones *mycommand;
  public:
        ModuleClones(InspIRCd* Me) : Module(Me)
        {
-               
-               mycommand = new cmd_clones(ServerInstance);
+
+               mycommand = new CommandClones(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
-       
+
        virtual ~ModuleClones()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               /* we don't hook anything, nothing required */
-       }
-       
+
 };
 
 MODULE_INIT(ModuleClones)