Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

[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 194ecf80eacb375007f5a6451e673c743ee7ef21..3ad9cede918b916084c1f076873fa128ace82855 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -20,8 +20,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for the CHGNAME command */
-
 /** Handle /CHGNAME
  */
 class CommandChgname : public Command
@@ -29,31 +27,38 @@ class CommandChgname : public Command
  public:
        CommandChgname(Module* Creator) : Command(Creator,"CHGNAME", 2, 2)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o';
                syntax = "<nick> <newname>";
-               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+               TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
        CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
 
-               if (!dest)
+               if ((!dest) || (dest->registered != REG_ALL))
+               {
+                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+                       return CMD_FAILURE;
+               }
+
+               if (parameters[1].empty())
                {
-                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNotice("*** CHGNAME: GECOS must be specified");
                        return CMD_FAILURE;
                }
 
                if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
                {
-                       user->WriteServ("NOTICE %s :*** GECOS too long", user->nick.c_str());
+                       user->WriteNotice("*** CHGNAME: GECOS too long");
                        return CMD_FAILURE;
                }
 
                if (IS_LOCAL(dest))
                {
-                       dest->ChangeName(parameters[1].c_str());
-                       ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str());
+                       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());
                }
 
                return CMD_SUCCESS;
@@ -68,7 +73,6 @@ class CommandChgname : public Command
        }
 };
 
-
 class ModuleChgName : public Module
 {
        CommandChgname cmd;
@@ -76,18 +80,12 @@ class ModuleChgName : public Module
 public:
        ModuleChgName() : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
        }
 
-       virtual ~ModuleChgName()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleChgName)