fix some unitialised vectors and tidy up a bit.

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

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 5673c7f62f2243000b5e8ded1b638ee87280c1ac..986e40713c074b640e2e6cf55d5b6a2a34b24f62 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -41,9 +41,9 @@ class CommandCAP : public Command
                this->source = "m_cap.so";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               irc::string subcommand = parameters[0];
+               irc::string subcommand = parameters[0].c_str();
 
                if (subcommand == "REQ")
                {
@@ -53,7 +53,7 @@ class CommandCAP : public Command
                        Data.user = user;
                        Data.creator = this->Creator;
 
-                       if (pcnt < 2)
+                       if (parameters.size() < 2)
                                return CMD_FAILURE;
 
                        // tokenize the input into a nice list of requested caps
@@ -76,9 +76,9 @@ class CommandCAP : public Command
                                user->WriteServ("CAP * ACK :%s", AckResult.c_str());
                        }
 
-                       if (Data.nak.size() > 0)
+                       if (Data.wanted.size() > 0)
                        {
-                               std::string NakResult = irc::stringjoiner(" ", Data.nak, 0, Data.nak.size() - 1).GetJoined();
+                               std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
                                user->WriteServ("CAP * NAK :%s", NakResult.c_str());
                        }
                }
@@ -98,8 +98,13 @@ class CommandCAP : public Command
                        Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
                        event.Send(this->ServerInstance);
 
-                       std::string Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
-                       user->WriteServ("CAP * LS :%s", Result.c_str());
+                       std::string Result;
+                       if (Data.wanted.size() > 0)
+                               Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+                       else
+                               Result = "";
+
+                       user->WriteServ("CAP * %s :%s", subcommand.c_str(), Result.c_str());
                }
                else if (subcommand == "CLEAR")
                {
@@ -118,7 +123,7 @@ class CommandCAP : public Command
                }
                else
                {
-                       user->WriteServ("410 * %s :Invalid CAP subcommand", subcommand.c_str());
+                       user->WriteNumeric(410, "* %s :Invalid CAP subcommand", subcommand.c_str());
                }
 
                return CMD_FAILURE;
@@ -144,9 +149,9 @@ class ModuleCAP : public Module
        {
                /* Users in CAP state get held until CAP END */
                if (user->GetExt("CAP_REGHOLD"))
-                       return true;
+                       return false;
 
-               return false;
+               return true;
        }
 
        virtual ~ModuleCAP()
@@ -155,7 +160,7 @@ class ModuleCAP : 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);
        }
 };