Merge pull request #1361 from genius3000/master+rline_IP

[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 e3e02fbe80f2d40de20d102ea1c169d99b63ba1b..e2a5dc281b603b38c8a5e9afd831956e7a9113f8 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for the SETHOST command */
-
 /** Handle /SETHOST
  */
 class CommandSethost : public Command
@@ -34,13 +32,17 @@ class CommandSethost : public Command
        {
                allow_empty_last_param = false;
                flags_needed = 'o'; syntax = "<new-hostname>";
-               TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               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])
                        {
@@ -49,13 +51,7 @@ class CommandSethost : public Command
                        }
                }
 
-               if (len > 64)
-               {
-                       user->WriteNotice("*** SETHOST: Host too long");
-                       return CMD_FAILURE;
-               }
-
-               if (user->ChangeDisplayedHost(parameters[0].c_str()))
+               if (user->ChangeDisplayedHost(parameters[0]))
                {
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->dhost);
                        return CMD_SUCCESS;
@@ -77,15 +73,7 @@ class ModuleSetHost : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-               ServerInstance->Modules->AddService(cmd);
-               Implementation eventlist[] = { I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");