Move all the parameters around AGAIN. See docs shortly

[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 2849444b408a98302349cfa1b81e2667f8340942..6fc1584ec68c0331dc662966c8838bb53957b00b 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -20,11 +20,11 @@
 CAP LS
 :alfred.staticbox.net CAP * LS :multi-prefix sasl
 CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :multi-prefix 
+:alfred.staticbox.net CAP * ACK :multi-prefix
 CAP CLEAR
 :alfred.staticbox.net CAP * ACK :-multi-prefix
 CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :multi-prefix 
+:alfred.staticbox.net CAP * ACK :multi-prefix
 CAP LIST
 :alfred.staticbox.net CAP * LIST :multi-prefix
 CAP END
@@ -43,10 +43,6 @@ class CommandCAP : public Command
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               /* Ignore CAP from registered clients */
-               if (user->registered == REG_ALL)
-                       return CMD_FAILURE;
-
                irc::string subcommand = parameters[0].c_str();
 
                if (subcommand == "REQ")
@@ -127,7 +123,7 @@ class CommandCAP : public Command
                }
                else
                {
-                       user->WriteNumeric(410, "* %s :Invalid CAP subcommand", subcommand.c_str());
+                       user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
                }
 
                return CMD_FAILURE;
@@ -164,7 +160,7 @@ class ModuleCAP : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };