Merge pull request #1337 from SaberUK/master+merge

[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 ecdea5be080148a4812956eb2f11668802fd9b0c..b3e695bfde0c3c224a4d17ddb63cc825da6e127b 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -34,7 +34,7 @@ class CommandClones : public Command
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
 
-               std::string clonesstr = "304 " + user->nick + " :CLONES";
+               std::string clonesstr = "CLONES ";
 
                unsigned long limit = atoi(parameters[0].c_str());
 
@@ -45,17 +45,18 @@ class CommandClones : public Command
                 *  :server.name 304 target :CLONES END
                 */
 
-               user->WriteServ(clonesstr + " START");
+               user->WriteNumeric(304, clonesstr + "START");
 
                /* hostname or other */
-               // 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++)
+               const UserManager::CloneMap& clonemap = ServerInstance->Users->GetCloneMap();
+               for (UserManager::CloneMap::const_iterator i = clonemap.begin(); i != clonemap.end(); ++i)
                {
-                       if (x->second >= limit)
-                               user->WriteServ(clonesstr + " "+ ConvToStr(x->second) + " " + x->first.str());
+                       const UserManager::CloneCounts& counts = i->second;
+                       if (counts.global >= limit)
+                               user->WriteNumeric(304, clonesstr + ConvToStr(counts.global) + " " + i->first.str());
                }
 
-               user->WriteServ(clonesstr + " END");
+               user->WriteNumeric(304, clonesstr + "END");
 
                return CMD_SUCCESS;
        }
@@ -69,11 +70,6 @@ class ModuleClones : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);