X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_clones.cpp;h=9742ea29d6c714797c01229c871f952a71a6c16b;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=afb0c3a4b0d040e11bbe087df3e7bab6968f2970;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index afb0c3a4b..9742ea29d 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,60 +11,47 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.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(Module* Creator) : Command(Creator,"CLONES", 1)
 	{
-		this->source = "m_clones.so";
-		syntax = "<limit>";
+		flags_needed = 'o'; 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");
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -72,53 +59,23 @@ class cmd_clones : public command_t
 class ModuleClones : public Module
 {
  private:
-	cmd_clones *mycommand;
+	CommandClones cmd;
  public:
-	ModuleClones(InspIRCd* Me) : Module(Me)
+	ModuleClones() : cmd(this)
 	{
-		
-		mycommand = new cmd_clones(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleClones()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
 
-	void Implements(char* List)
+	virtual Version GetVersion()
 	{
-		/* we don't hook anything, nothing required */
+		return Version("Provides the /clones command to retrieve information on clones.", VF_VENDOR, API_VERSION);
 	}
-	
-};
-
 
 
-class ModuleClonesFactory : public ModuleFactory
-{
- public:
-	ModuleClonesFactory()
-	{
-	}
-	
-	~ModuleClonesFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleClones(Me);
-	}
-	
 };
 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleClonesFactory;
-}
-
+MODULE_INIT(ModuleClones)