X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_chgident.cpp;h=95bf84e9ac873958b275a827fd8e470ef56f4255;hb=b5965b08c23e3e89404b481386f2e56ce7cb7ce2;hp=740eeadf144e0e1933af8677f39902bdcaa48ba9;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 740eeadf1..95bf84e9a 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,93 +12,84 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
 /** Handle /CHGIDENT
  */
-class cmd_chgident : public command_t
+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";
+		flags_needed = 'o';
 		syntax = "<nick> <newident>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
-	
-	CmdResult 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)
 		{
-			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
-		if(!ServerInstance->IsIdent(parameters[1]))
+		if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax)
 		{
-			user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick.c_str());
 			return CMD_FAILURE;
 		}
 
-		dest->ChangeIdent(parameters[1]);
-		ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
+		if (!ServerInstance->IsIdent(parameters[1].c_str()))
+		{
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		if (IS_LOCAL(dest))
+		{
+			dest->ChangeIdent(parameters[1].c_str());
+
+			if (!ServerInstance->ULine(user->server))
+				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());
+		}
 
-		/* route it! */
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
+	}
 };
 
 
 class ModuleChgIdent : public Module
 {
-	cmd_chgident* mycommand;
-	
-	
+	CommandChgident cmd;
+
 public:
-	ModuleChgIdent(InspIRCd* Me) : Module(Me)
+	ModuleChgIdent() : cmd(this)
 	{
-		mycommand = new cmd_chgident(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleChgIdent()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-	ModuleChgIdentFactory()
-	{
-	}
-	
-	~ModuleChgIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChgIdent(Me);
-	}
-	
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)