X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=0456a8539f340695a1fb0077807f3326e3b46d3f;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=ad14c786f0628f2b848ea1a7874c6c8fe8f5dad4;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index ad14c786f..0456a8539 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,49 +1,71 @@
-#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 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 (InspIRCd* Instance) : Command(Instance,"SETIDENT", "o", 1)
 	{
 		this->source = "m_setident.so";
 		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);
+			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() > IDENTMAX)
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick);
+			return CMD_FAILURE;
+		}
+		
+		if (!ServerInstance->IsIdent(parameters[0].c_str()))
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick);
+			return CMD_FAILURE;
+		}
+		
+		user->ChangeIdent(parameters[0].c_str());
+		ServerInstance->SNO->WriteToSnoMask('A', "%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
+
+		return CMD_SUCCESS;
 	}
 };
 
 
 class ModuleSetIdent : public Module
 {
-	cmd_setident*	mycommand;
+	CommandSetident*	mycommand;
 	
  public:
-	ModuleSetIdent(InspIRCd* Me) : Module::Module(Me)
+	ModuleSetIdent(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_setident();
-		Srv->AddCommand(mycommand);
+		mycommand = new CommandSetident(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleSetIdent()
@@ -52,34 +74,10 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,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(InspIRCd* Me)
-	{
-		return new ModuleSetIdent(Me);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
-
+MODULE_INIT(ModuleSetIdent)