X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_sethost.cpp;h=b37207b4fa7e93020aa3bb13ac0d795c9225bc52;hb=451e687f681ccab5c02a8de1a7d59b324efbfe08;hp=636f2ff6b31ebf2a5702c932ba3f191da829d7e5;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 636f2ff6b..b37207b4f 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -36,8 +36,13 @@ class CommandSethost : public Command
 
 	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])
 			{
@@ -46,15 +51,9 @@ class CommandSethost : public Command
 			}
 		}
 
-		if (len > 64)
+		if (user->ChangeDisplayedHost(parameters[0]))
 		{
-			user->WriteNotice("*** SETHOST: Host too long");
-			return CMD_FAILURE;
-		}
-
-		if (user->ChangeDisplayedHost(parameters[0].c_str()))
-		{
-			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;
 		}
 
@@ -74,13 +73,7 @@ class ModuleSetHost : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		OnRehash(NULL);
-		ServerInstance->Modules->AddService(cmd);
-	}
-
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");