X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_taxonomy.cpp;h=6f06b36605558828af65c0b7f0468d25dbacedb8;hb=6e85701ecb09604f2c87010683638ec0446cc515;hp=0790949a881c81d6e26d60afd7ca0e2c0b7bc5f2;hpb=371b1d7ef0e17f8550e9b2379bed563969e41c04;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index 0790949a8..6f06b3660 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.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.
@@ -23,30 +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;
 			dest->GetExtList(list);
-			user->WriteServ("304 " + std::string(user->nick) + ":TAXONOMY ITEMS " + std::string(dest->nick) + " " +ConvToStr(list.size()));
+			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;
 	}
@@ -54,28 +54,23 @@ class CommandTaxonomy : public Command
 
 class ModuleTaxonomy : public Module
 {
-	CommandTaxonomy* newcommand;
+	CommandTaxonomy cmd;
 	bool claimed;
  public:
 	ModuleTaxonomy(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cmd(Me, this, claimed)
 	{
-		
-		// Create a new command
-		newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
-		ServerInstance->AddCommand(newcommand);
-		Implementation eventlist[] = { I_ProtoSendMetaData };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->AddCommand(&cmd);
 	}
 
 
-	void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
+	void ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata)
 	{
 		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;
 		}
 	}
@@ -86,7 +81,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);
 	}
 };