X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chgident.cpp;h=5abb79a2baff5e7c79e9648dda82919c922ee4bf;hb=6cfabb0064cab52bbbab59974e53dc0fa1954da7;hp=968497f8c6046e679340dceee7fe3e0385e1d66a;hpb=349106f3f9f75d7f957fc5d1e71ca650f4807bb9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 968497f8c..5abb79a2b 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *
  * 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
@@ -22,8 +27,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for the CHGIDENT command */
-
 /** Handle /CHGIDENT
  */
 class CommandChgident : public Command
@@ -31,54 +34,51 @@ class CommandChgident : public Command
  public:
 	CommandChgident(Module* Creator) : Command(Creator,"CHGIDENT", 2)
 	{
+		allow_empty_last_param = false;
 		flags_needed = 'o';
-		syntax = "<nick> <newident>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		syntax = "<nick> <ident>";
+		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]);
 
-		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].length() > ServerInstance->Config->Limits.IdentMax)
 		{
-			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick.c_str());
+			user->WriteNotice("*** CHGIDENT: Ident is too long");
 			return CMD_FAILURE;
 		}
 
-		if (!ServerInstance->IsIdent(parameters[1].c_str()))
+		if (!ServerInstance->IsIdent(parameters[1]))
 		{
-			user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick.c_str());
+			user->WriteNotice("*** CHGIDENT: Invalid characters in ident");
 			return CMD_FAILURE;
 		}
 
 		if (IS_LOCAL(dest))
 		{
-			dest->ChangeIdent(parameters[1].c_str());
+			dest->ChangeIdent(parameters[1]);
 
-			if (!ServerInstance->ULine(user->server))
+			if (!user->server->IsULine())
 				ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGIDENT to change %s's ident to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->ident.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]);
 	}
 };
 
-
 class ModuleChgIdent : public Module
 {
 	CommandChgident cmd;
@@ -88,21 +88,10 @@ public:
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
-	virtual ~ModuleChgIdent()
+	Version GetVersion() CXX11_OVERRIDE
 	{
+		return Version("Adds the /CHGIDENT command which allows server operators to change the username (ident) of a user.", VF_OPTCOMMON | VF_VENDOR);
 	}
-
-	virtual Version GetVersion()
-	{
-		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
-	}
-
 };
 
 MODULE_INIT(ModuleChgIdent)
-