Add SHUN as a /filter action

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

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 75dbe1c6a6c00f84a4ce09661b720c4327d60210..23dbbad5684d3cd7f3790221bf06d356b403a009 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -34,10 +34,15 @@ class CommandSethost : public Command
                flags_needed = 'o'; syntax = "<new-hostname>";
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
-               size_t len = 0;
-               for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++, len++)
+               if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost)
+               {
+                       user->WriteNotice("*** SETHOST: Host too long");
+                       return CMD_FAILURE;
+               }
+
+               for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++)
                {
                        if (!hostmap[(const unsigned char)*x])
                        {
@@ -46,15 +51,9 @@ class CommandSethost : public Command
                        }
                }
 
-               if (len > ServerInstance->Config->Limits.MaxHost)
-               {
-                       user->WriteNotice("*** SETHOST: Host too long");
-                       return CMD_FAILURE;
-               }
-
                if (user->ChangeDisplayedHost(parameters[0]))
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->dhost);
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->GetDisplayedHost());
                        return CMD_SUCCESS;
                }