X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_taxonomy.cpp;h=e9df6221d175628914358c02eda3b043068494d9;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=ca88d1c4a58ecb0186e16faae6471fb3d05fc03e;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index ca88d1c4a..e9df6221d 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.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
@@ -23,31 +23,30 @@ class CommandTaxonomy : public Command
 	bool& claimed;
  public:
 	/* Command 'taxonomy', takes no parameters and needs no special modes */
-	CommandTaxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
+	CommandTaxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", "o", 1), Creator(maker), claimed(claim)
 	{
 		this->source = "m_taxonomy.so";
 		syntax = "<nickname>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
 			std::deque<std::string> list;
-			list.clear();
-			user->GetExtList(list);
-			user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY ITEMS " + std::string(dest->nick) + " " +ConvToStr(list.size()));
+			dest->GetExtList(list);
+			user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY ITEMS " + std::string(dest->nick) + " " +ConvToStr(list.size()));
 			for (unsigned int j = 0; j < list.size(); j++)
 			{
 				claimed = false;
-				FOREACH_MOD(I_OnSyncUserMetaData, OnSyncUserMetaData(user, Creator, dest, list[j], true));
+				FOREACH_MOD(I_OnSyncUserMetaData, OnSyncUserMetaData(dest, Creator, user, list[j], true));
 				if (!claimed)
 				{
-					user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY METADATA " + list[j] + " = <unknown>");
+					user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY METADATA " + list[j] + " = <unknown>");
 				}
 			}
-			user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY END");
+			user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY END");
 		}
 		return CMD_LOCALONLY;
 	}
@@ -61,7 +60,7 @@ class ModuleTaxonomy : public Module
 	ModuleTaxonomy(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		// Create a new command
 		newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
 		ServerInstance->AddCommand(newcommand);
@@ -74,9 +73,9 @@ class ModuleTaxonomy : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			User* spool = (User*)opaque;
-			std::string taxstr = "304 " + std::string(spool->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
-			spool->WriteServ(taxstr);
+			User* spoolto = (User*)opaque;
+			std::string taxstr = "304 " + std::string(spoolto->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
+			spoolto->WriteServ(taxstr);
 			claimed = true;
 		}
 	}
@@ -87,7 +86,7 @@ class ModuleTaxonomy : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };