fixed some indentation and spacing in modules

[user/henk/code/inspircd.git] / src / modules / m_taxonomy.cpp

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index da8ad97492fb24e17b93c37a2de4d1657df8f24e..516af20c3af0e2fbacbdd69a5c0c9d28dfef5252 100644 (file)
--- 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
@@ -17,37 +17,36 @@
 
 /** Handle /TAXONOMY
  */
-class cmd_taxonomy : public Command
+class CommandTaxonomy : public Command
 {
        Module* Creator;
        bool& claimed;
  public:
        /* Command 'taxonomy', takes no parameters and needs no special modes */
-       cmd_taxonomy (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, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               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));
                                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;
        }
@@ -55,30 +54,28 @@ class cmd_taxonomy : public Command
 
 class ModuleTaxonomy : public Module
 {
-       cmd_taxonomy* newcommand;
+       CommandTaxonomy* newcommand;
        bool claimed;
  public:
        ModuleTaxonomy(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                // Create a new command
-               newcommand = new cmd_taxonomy(ServerInstance, this, claimed);
+               newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
                ServerInstance->AddCommand(newcommand);
+               Implementation eventlist[] = { I_ProtoSendMetaData };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_ProtoSendMetaData] = 1;
-       }
 
        void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* spool = (userrec*)opaque;
-                       std::string taxstr = "304 " + std::string(spool->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
-                       spool->WriteServ(taxstr);
+                       User* spoolto = (User*)target;
+                       std::string taxstr = "304 " + std::string(spoolto->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
+                       spoolto->WriteServ(taxstr);
                        claimed = true;
                }
        }
@@ -89,7 +86,7 @@ class ModuleTaxonomy : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };