X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=ecdf63fb0b078e512f469d39b2d506d3958022dc;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=88375559823abeb8f7d3a0afb049359343411db9;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 883755598..ecdf63fb0 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,13 +1,24 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 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"
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
-
-extern InspIRCd* ServerInstance;
-
+/** Handle /SETIDENT
+ */
 class cmd_setident : public command_t
 {
  public:
@@ -17,19 +28,30 @@ class cmd_setident : public command_t
 		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++)
+		if (!*parameters[0])
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick);
+			return CMD_FAILURE;
+		}
+		
+		if (strlen(parameters[0]) > IDENTMAX)
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick);
+			return CMD_FAILURE;
+		}
+		
+		if (!ServerInstance->IsIdent(parameters[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: Invalid characters in ident", 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);
+		user->ChangeIdent(parameters[0]);
+		ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
+
+		return CMD_SUCCESS;
 	}
 };
 
@@ -39,7 +61,7 @@ class ModuleSetIdent : public Module
 	cmd_setident*	mycommand;
 	
  public:
-	ModuleSetIdent(InspIRCd* Me) : Module::Module(Me)
+	ModuleSetIdent(InspIRCd* Me) : Module(Me)
 	{
 		
 		mycommand = new cmd_setident(ServerInstance);
@@ -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, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
-
+MODULE_INIT(ModuleSetIdent)