Move OnSync{Channel,Network,User} to ServerEventListener.

[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 3a637f9d0f7d6c8a99d3b166defed713dce33a0f..30efd1390ffc74820aa18d5fb660e5c00f4860de 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -35,17 +35,15 @@ class CommandChghost : public Command
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
-               const char* x = parameters[1].c_str();
-
                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])
                        {
@@ -56,9 +54,10 @@ 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 :No such nick/channel", parameters[0].c_str());
+                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
                        return CMD_FAILURE;
                }
 
@@ -67,19 +66,16 @@ class CommandChghost : public Command
                        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 std::vector<std::string>& 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]);
        }
 };