X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_clones.cpp;h=b3e695bfde0c3c224a4d17ddb63cc825da6e127b;hb=f471083cd0519d47c7c7a09029813ede41994f7b;hp=cc89c2b58b18eb0db8f6b9579e51d6649b133e4a;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index cc89c2b58..b3e695bfd 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -1,94 +1,79 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "wildcard.h"
 
-/* $ModDesc: Provides the /clones command to retrieve information on a user, channel, or IP address */
+#include "inspircd.h"
 
-/** Handle /CHECK
+/** Handle /CLONES
  */
 class CommandClones : public Command
 {
  public:
- 	CommandClones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1)
-	{
-		this->source = "m_clones.so";
-		syntax = "<limit>";
-	}
-
-	std::string FindMatchingIP(const irc::string &ipaddr)
+ 	CommandClones(Module* Creator) : Command(Creator,"CLONES", 1)
 	{
-		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 "<?>";
+		flags_needed = 'o'; syntax = "<limit>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 
-		std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES";
+		std::string clonesstr = "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 :CHECK END
+		 *  :server.name 304 target :CLONES <count> <ip>
+		 *  :server.name 304 target :CLONES END
 		 */
 
-		user->WriteServ(clonesstr + " START");
+		user->WriteNumeric(304, clonesstr + "START");
 
 		/* hostname or other */
-		for (clonemap::iterator x = ServerInstance->global_clones.begin(); x != ServerInstance->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) + " " + assign(x->first) + " " + FindMatchingIP(x->first));
+			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_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
-
 class ModuleClones : public Module
 {
- private:
-	CommandClones *mycommand;
+	CommandClones cmd;
  public:
-	ModuleClones(InspIRCd* Me) : Module(Me)
-	{
-		
-		mycommand = new CommandClones(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
-	}
-	
-	virtual ~ModuleClones()
+	ModuleClones() : cmd(this)
 	{
 	}
-	
-	virtual Version GetVersion()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);
 	}
-
-	
 };
 
 MODULE_INIT(ModuleClones)