Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 1748f516c9ef4704f4d4ff808c044101c2cd3c9f..0ca7dc78c97e12d18b18d42c60222a29f34b6e7b 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -25,29 +25,29 @@
  */
 class CommandChghost : public Command
 {
-       char* hostmap;
  public:
-       CommandChghost(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
+       std::bitset<UCHAR_MAX> hostmap;
+
+       CommandChghost(Module* Creator)
+               : Command(Creator,"CHGHOST", 2)
        {
                allow_empty_last_param = false;
                flags_needed = 'o';
-               syntax = "<nick> <newhost>";
+               syntax = "<nick> <host>";
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               const char* x = parameters[1].c_str();
-
-               if (parameters[1].length() > 63)
+               if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost)
                {
                        user->WriteNotice("*** CHGHOST: Host too long");
                        return CMD_FAILURE;
                }
 
-               for (; *x; x++)
+               for (std::string::const_iterator x = parameters[1].begin(); x != parameters[1].end(); x++)
                {
-                       if (!hostmap[(unsigned char)*x])
+                       if (!hostmap.test(static_cast<unsigned char>(*x)))
                        {
                                user->WriteNotice("*** CHGHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
@@ -56,30 +56,28 @@ class CommandChghost : public Command
 
                User* dest = ServerInstance->FindNick(parameters[0]);
 
-               if ((!dest) || (dest->registered != REG_ALL))
+               // Allow services to change the host of unregistered users
+               if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsULine())))
                {
-                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
                        return CMD_FAILURE;
                }
 
                if (IS_LOCAL(dest))
                {
-                       if ((dest->ChangeDisplayedHost(parameters[1])) && (!ServerInstance->ULine(user->server)))
+                       if ((dest->ChangeDisplayedHost(parameters[1])) && (!user->server->IsULine()))
                        {
                                // fix by brain - ulines set hosts silently
-                               ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+                               ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->GetDisplayedHost());
                        }
                }
 
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               User* dest = ServerInstance->FindNick(parameters[0]);
-               if (dest)
-                       return ROUTE_OPT_UCAST(dest->server);
-               return ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };
 
@@ -87,10 +85,10 @@ class CommandChghost : public Command
 class ModuleChgHost : public Module
 {
        CommandChghost cmd;
-       char hostmap[256];
 
  public:
-       ModuleChgHost() : cmd(this, hostmap)
+       ModuleChgHost()
+               : cmd(this)
        {
        }
 
@@ -98,14 +96,14 @@ class ModuleChgHost : public Module
        {
                std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
 
-               memset(hostmap, 0, sizeof(hostmap));
+               cmd.hostmap.reset();
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
-                       hostmap[(unsigned char)*n] = 1;
+                       cmd.hostmap.set(static_cast<unsigned char>(*n));
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
        }
 };