X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_clones.cpp;h=b3e695bfde0c3c224a4d17ddb63cc825da6e127b;hb=eef45dbfb90f951f3048038aea3ff68b5c157f6d;hp=830d922320ce6d47b51f2d64f8b36a8a9ceb4a5e;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 830d92232..b3e695bfd 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the /CLONES command to retrieve information on clones. */
-
 /** Handle /CLONES
  */
 class CommandClones : public Command
@@ -36,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());
 
@@ -47,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;
 	}
@@ -71,12 +70,7 @@ class ModuleClones : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);
 	}