Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp
index d591eed5528264bb5966eaa46358dbc5b76b053d..881ef490b7ef4bc15e86e317743bfd104d495f08 100644 (file)
--- a/src/modules/m_starttls.cpp
+++ b/src/modules/m_starttls.cpp
@@ -40,27 +40,27 @@ class CommandStartTLS : public SplitCommand
                works_before_reg = true;
        }
 
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (!ssl)
                {
-                       user->WriteNumeric(ERR_STARTTLS, ":STARTTLS is not enabled");
+                       user->WriteNumeric(ERR_STARTTLS, "STARTTLS is not enabled");
                        return CMD_FAILURE;
                }
 
                if (user->registered == REG_ALL)
                {
-                       user->WriteNumeric(ERR_STARTTLS, ":STARTTLS is not permitted after client registration is complete");
+                       user->WriteNumeric(ERR_STARTTLS, "STARTTLS is not permitted after client registration is complete");
                        return CMD_FAILURE;
                }
 
                if (user->eh.GetIOHook())
                {
-                       user->WriteNumeric(ERR_STARTTLS, ":STARTTLS failure");
+                       user->WriteNumeric(ERR_STARTTLS, "STARTTLS failure");
                        return CMD_FAILURE;
                }
 
-               user->WriteNumeric(RPL_STARTTLS, ":STARTTLS successful, go ahead with TLS handshake");
+               user->WriteNumeric(RPL_STARTTLS, "STARTTLS successful, go ahead with TLS handshake");
                /* We need to flush the write buffer prior to adding the IOHook,
                 * otherwise we'll be sending this line inside the SSL session - which
                 * won't start its handshake until the client gets this line. Currently,
@@ -80,7 +80,7 @@ class CommandStartTLS : public SplitCommand
 class ModuleStartTLS : public Module
 {
        CommandStartTLS starttls;
-       GenericCap tls;
+       Cap::Capability tls;
        dynamic_reference_nocheck<IOHookProvider> ssl;
 
  public:
@@ -102,19 +102,9 @@ class ModuleStartTLS : public Module
                        ssl.SetProvider("ssl/" + newprovider);
        }
 
-       void OnEvent(Event& ev) CXX11_OVERRIDE
-       {
-               tls.HandleEvent(ev);
-       }
-
-       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
-       {
-               tokens["STARTTLS"];
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the STARTTLS command", VF_VENDOR);
+               return Version("Provides the STARTTLS command", VF_VENDOR);
        }
 };