Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 3ad9cede918b916084c1f076873fa128ace82855..bcbf22a14f3926fb5465e4cb18c336599b2faa9e 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -29,11 +29,11 @@ class CommandChgname : public Command
        {
                allow_empty_last_param = false;
                flags_needed = 'o';
-               syntax = "<nick> <newname>";
+               syntax = "<nick> :<realname>";
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
 
@@ -45,31 +45,28 @@ class CommandChgname : public Command
 
                if (parameters[1].empty())
                {
-                       user->WriteNotice("*** CHGNAME: GECOS must be specified");
+                       user->WriteNotice("*** CHGNAME: Real name must be specified");
                        return CMD_FAILURE;
                }
 
-               if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
+               if (parameters[1].length() > ServerInstance->Config->Limits.MaxReal)
                {
-                       user->WriteNotice("*** CHGNAME: GECOS too long");
+                       user->WriteNotice("*** CHGNAME: Real name is too long");
                        return CMD_FAILURE;
                }
 
                if (IS_LOCAL(dest))
                {
-                       dest->ChangeName(parameters[1]);
-                       ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's GECOS to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str());
+                       dest->ChangeRealName(parameters[1]);
+                       ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->GetRealName().c_str());
                }
 
                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]);
        }
 };
 
@@ -84,7 +81,7 @@ public:
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
        }
 };