X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=7c129ab9c106949f289c82913bc9f6c6898dbdfd;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;hp=b3bcef53ba598acba6ee758cbb08e2aa61cad6e3;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index b3bcef53b..7c129ab9c 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,85 +1,79 @@
-#include "users.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-
-class cmd_setident : public command_t
+/** Handle /SETIDENT
+ */
+class CommandSetident : public Command
 {
  public:
-	cmd_setident() : command_t("SETIDENT", 'o', 1)
+ CommandSetident(Module* Creator) : Command(Creator,"SETIDENT", 1)
 	{
-		this->source = "m_setident.so";
-		syntax = "<new-ident>";
+		flags_needed = 'o'; syntax = "<new-ident>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
 	{
-		for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+		if (parameters.size() == 0)
 		{
-			if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x]))
-				continue;
-			
-			user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-			return;
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick.c_str());
+			return CMD_FAILURE;
 		}
-		
-		ServerInstance->WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]);
-		strlcpy(user->ident, parameters[0], IDENTMAX+2);
+
+		if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax)
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		if (!ServerInstance->IsIdent(parameters[0].c_str()))
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
+		user->ChangeIdent(parameters[0].c_str());
+		ServerInstance->SNO->WriteGlobalSno('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str());
+
+		return CMD_SUCCESS;
 	}
 };
 
 
 class ModuleSetIdent : public Module
 {
-	cmd_setident*	mycommand;
-	
+	CommandSetident cmd;
+
  public:
-	ModuleSetIdent(Server* Me) : Module::Module(Me)
+	ModuleSetIdent() : cmd(this)
 	{
-		Srv = Me;
-		mycommand = new cmd_setident();
-		Srv->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleSetIdent()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version("Provides support for the SETIDENT command", VF_VENDOR);
 	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSetIdentFactory : public ModuleFactory
-{
- public:
-	ModuleSetIdentFactory()
-	{
-	}
-	
-	~ModuleSetIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleSetIdent(Me);
-	}
-	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
-
+MODULE_INIT(ModuleSetIdent)