X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chgident.cpp;h=3ccecf76c491e69cd4b82418eabcd4edd4d006af;hb=f1712e6f0b58098250791ffc60815fa3fc462607;hp=cca24372a618d9f6e2f26af86b52a4d07952423e;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index cca24372a..3ccecf76c 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,91 +1,94 @@
-#include <string>
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
-extern InspIRCd* ServerInstance;
-
-class cmd_chgident : public command_t
+/** Handle /CHGIDENT
+ */
+class CommandChgident : public Command
 {
  public:
- cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
+	CommandChgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", "o", 2)
 	{
 		this->source = "m_chgident.so";
 		syntax = "<nick> <newident>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
-	
-	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)
+		{
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			return CMD_FAILURE;
+		}
 
-		if(dest)
+		if (parameters[1].empty())
 		{
-			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]);
-			strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick.c_str());
+			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->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick.c_str());
+			return CMD_FAILURE;
 		}
+
+		if (!ServerInstance->IsIdent(parameters[1].c_str()))
+		{
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		dest->ChangeIdent(parameters[1].c_str());
+
+		if (!ServerInstance->ULine(user->server))
+			ServerInstance->SNO->WriteToSnoMask('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;
 	}
 };
 
 
 class ModuleChgIdent : public Module
 {
-	cmd_chgident* mycommand;
-	
-	
+	CommandChgident* mycommand;
+
+
 public:
-	ModuleChgIdent(InspIRCd* Me) : Module::Module(Me)
+	ModuleChgIdent(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_chgident(ServerInstance);
+		mycommand = new CommandChgident(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
-	
+
 	virtual ~ModuleChgIdent()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version("$Id$", VF_COMMON | 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(InspIRCd* Me)
-	{
-		return new ModuleChgIdent(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)