X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chgname.cpp;h=830d5070b60c1b47ed50bfd0ac2031026663ce39;hb=aa05a6fd4d5c11dc8e8adc469134a2802446fe9f;hp=aadf29fdb4532b54fe82aebda8d0b4b427e7b127;hpb=349106f3f9f75d7f957fc5d1e71ca650f4807bb9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index aadf29fdb..830d5070b 100644
--- 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,36 +27,37 @@ 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(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
 		if (parameters[1].empty())
 		{
-			user->WriteServ("NOTICE %s :*** CHGNAME: GECOS must be specified", user->nick.c_str());
+			user->WriteNotice("*** CHGNAME: GECOS must be specified");
 			return CMD_FAILURE;
 		}
 
 		if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
 		{
-			user->WriteServ("NOTICE %s :*** CHGNAME: 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());
+			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());
 		}
 
@@ -74,7 +73,6 @@ class CommandChgname : public Command
 	}
 };
 
-
 class ModuleChgName : public Module
 {
 	CommandChgname cmd;
@@ -84,20 +82,10 @@ public:
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(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)