X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=d1f67bb1400a07bc088c8395cbb1d620e363d55b;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=828f25792f9d08589bd7e0f823ed3f343cf18f97;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 828f25792..d1f67bb14 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,35 +1,39 @@
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
-
-extern InspIRCd* ServerInstance;
-
 class cmd_setident : public command_t
 {
  public:
-	cmd_setident() : command_t("SETIDENT", 'o', 1)
+ cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1)
 	{
 		this->source = "m_setident.so";
 		syntax = "<new-ident>";
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+		size_t len = 0;
+		for(const char* x = parameters[0]; *x; x++, len++)
 		{
-			if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x]))
+			if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x))
 				continue;
-			
+
 			user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-			return;
+			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 (len > IDENTMAX)
+		{
+			user->WriteServ("NOTICE %s :*** Ident is too long", user->nick);
+			return CMD_FAILURE;
+		}
+
+		user->ChangeIdent(parameters[0]);
+		ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
+
+		return CMD_SUCCESS;
 	}
 };
 
@@ -42,7 +46,7 @@ class ModuleSetIdent : public Module
 	ModuleSetIdent(InspIRCd* Me) : Module::Module(Me)
 	{
 		
-		mycommand = new cmd_setident();
+		mycommand = new cmd_setident(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
@@ -52,7 +56,7 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };