X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chgident.cpp;h=135b26446d973a36c7f3391d40b26f155e258895;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=52bfd237cfe9f0fa61043470935d5ebfe9d3895a;hpb=15314fa27a558a93f7aa7c1e32c6e4e9b4b4628b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 52bfd237c..135b26446 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,93 +1,100 @@
-#include <string>
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-/* $ModDesc: Provides support for the CHGIDENT command */
-
-Server *Srv;
+#include "inspircd.h"
 
+/* $ModDesc: Provides support for the CHGIDENT command */
 
-class cmd_chgident : public command_t
+/** Handle /CHGIDENT
+ */
+class CommandChgident : public Command
 {
  public:
-	cmd_chgident() : command_t("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);
 	}
-	
-	void Handle(char **parameters, int pcnt, userrec *user)
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		userrec* dest = Srv->FindNick(std::string(parameters[0]));
-		
-		if(dest)
+		User* dest = ServerInstance->FindNick(parameters[0]);
+
+		if (!dest)
+		{
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
+		}
+
+		if (parameters[1].empty())
+		{
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax)
 		{
-			for(unsigned int x = 0; x < strlen(parameters[1]); x++)
-			{
-				if(((parameters[1][x] >= 'A') && (parameters[1][x] <= '}')) || strchr(".-0123456789", parameters[1][x]))
-					continue;
-			
-				WriteServ(user->fd, "NOTICE %s :*** Invalid characters in ident", user->nick);
-				return;
-			}
-		
-			WriteOpers("%s used CHGIDENT to change %s's ident from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]);
-			strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick.c_str());
+			return CMD_FAILURE;
 		}
-		else
+
+		if (!ServerInstance->IsIdent(parameters[1].c_str()))
 		{
-			WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			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());
+		}
+
+		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(Server* Me) : Module::Module(Me)
+	ModuleChgIdent() : cmd(this)
 	{
-		Srv = Me;
-		mycommand = new cmd_chgident();
-		Srv->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleChgIdent()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
-	
-};
-
-// 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(Server* Me)
-	{
-		return new ModuleChgIdent(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)