X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_chgident.cpp;h=0b4e78f127628362424e596f7df08082a34faf0a;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=a658e17930f3f0ad0306710632c1098ffb957f4a;hpb=8a7ee30ce6f5cc762619556b042182b7e7b57ba2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index a658e1793..0b4e78f12 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,92 +1,95 @@
-#include <string>
-#include "users.h"
-#include "modules.h"
-
-#include "inspircd.h"
-
-/* $ModDesc: Provides support for the CHGIDENT command */
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *
+ * 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"
 
-class cmd_chgident : public command_t
+/** Handle /CHGIDENT
+ */
+class CommandChgident : public Command
 {
  public:
-	cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
+	CommandChgident(Module* Creator) : Command(Creator,"CHGIDENT", 2)
 	{
-		this->source = "m_chgident.so";
+		allow_empty_last_param = false;
+		flags_needed = 'o';
 		syntax = "<nick> <newident>";
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
-	
-	void Handle(const char** parameters, int pcnt, userrec *user)
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 
-		if(dest)
+		if ((!dest) || (dest->registered != REG_ALL))
 		{
-			if(!ServerInstance->IsIdent(parameters[1]))
-			{
-				user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-				return;
-			}
-		
-			ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]);
-			dest->ChangeIdent(parameters[1]);
-			//strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+			return CMD_FAILURE;
 		}
-		else
+
+		if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax)
 		{
-			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			user->WriteNotice("*** CHGIDENT: Ident is too long");
+			return CMD_FAILURE;
 		}
-	}
-};
 
+		if (!ServerInstance->IsIdent(parameters[1]))
+		{
+			user->WriteNotice("*** CHGIDENT: Invalid characters in ident");
+			return CMD_FAILURE;
+		}
 
-class ModuleChgIdent : public Module
-{
-	cmd_chgident* mycommand;
-	
-	
-public:
-	ModuleChgIdent(InspIRCd* Me) : Module::Module(Me)
-	{
-		mycommand = new cmd_chgident(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleChgIdent()
-	{
+		if (IS_LOCAL(dest))
+		{
+			dest->ChangeIdent(parameters[1]);
+
+			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;
 	}
-	
-	virtual Version GetVersion()
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgIdentFactory : public ModuleFactory
+class ModuleChgIdent : public Module
 {
- public:
-	ModuleChgIdentFactory()
-	{
-	}
-	
-	~ModuleChgIdentFactory()
+	CommandChgident cmd;
+
+public:
+	ModuleChgIdent() : cmd(this)
 	{
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleChgIdent(Me);
+		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
-
+MODULE_INIT(ModuleChgIdent)