m_namedmodes Only show chan key to members and opers with channels/auspex

[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..73ae3d4870bc93d5d65d67604f7ffc3175f4e8c3 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -29,6 +29,7 @@ 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);
@@ -38,22 +39,28 @@ class CommandChgname : public Command
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
 
-               if (!dest)
+               if ((!dest) || (dest->registered != REG_ALL))
                {
                        user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
 
+               if (parameters[1].empty())
+               {
+                       user->WriteServ("NOTICE %s :*** CHGNAME: GECOS must be specified", user->nick.c_str());
+                       return CMD_FAILURE;
+               }
+
                if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
                {
-                       user->WriteServ("NOTICE %s :*** GECOS too long", user->nick.c_str());
+                       user->WriteServ("NOTICE %s :*** CHGNAME: GECOS too long", user->nick.c_str());
                        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());
+                       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;
@@ -76,7 +83,11 @@ class ModuleChgName : public Module
 public:
        ModuleChgName() : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual ~ModuleChgName()