Omit the server name internally when building a /STATS reply and prepend it later

[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 35c24fd23c4aca0b84233452ccd33da46c101477..605423ae049f0bf8c0472965c4caefee386b8db2 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -64,6 +64,7 @@ class CommandCAP : public Command
 
                        while (cap_stream.GetToken(cap_))
                        {
+                               std::transform(cap_.begin(), cap_.end(), cap_.begin(), ::tolower);
                                Data.wanted.push_back(cap_);
                        }
 
@@ -108,7 +109,7 @@ class CommandCAP : public Command
                }
                else
                {
-                       user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s %s :Invalid CAP subcommand", user->nick.c_str(), subcommand.c_str());
+                       user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s :Invalid CAP subcommand", subcommand.c_str());
                        return CMD_FAILURE;
                }
 
@@ -125,12 +126,6 @@ class ModuleCAP : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-               ServerInstance->Modules->AddService(cmd.reghold);
-       }
-
        ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
        {
                /* Users in CAP state get held until CAP END */