X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chgname.cpp;h=3ad9cede918b916084c1f076873fa128ace82855;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=11e7f4c9c767d31a4cf9d95c9d3082c5b5ee90f4;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 11e7f4c9c..3ad9cede9 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -1,19 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for the CHGNAME command */
+#include "inspircd.h"
 
 /** Handle /CHGNAME
  */
@@ -22,36 +27,38 @@ class CommandChgname : public Command
  public:
 	CommandChgname(Module* Creator) : Command(Creator,"CHGNAME", 2, 2)
 	{
-		flags_needed = 'o'; syntax = "<nick> <newname>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		allow_empty_last_param = false;
+		flags_needed = 'o';
+		syntax = "<nick> <newname>";
+		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(Numerics::NoSuchNick(parameters[0]));
 			return CMD_FAILURE;
 		}
 
 		if (parameters[1].empty())
 		{
-			user->WriteServ("NOTICE %s :*** 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 :*** 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;
@@ -66,26 +73,19 @@ class CommandChgname : public Command
 	}
 };
 
-
 class ModuleChgName : public Module
 {
 	CommandChgname cmd;
 
 public:
-	ModuleChgName(InspIRCd* Me) : Module(Me), cmd(this)
+	ModuleChgName() : cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleChgName()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
 	}
-
-	virtual Version GetVersion()
-	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
-	}
-
 };
 
 MODULE_INIT(ModuleChgName)