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

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index a56aec0d1..ecdf63fb0 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -11,9 +11,9 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
@@ -30,21 +30,24 @@ class cmd_setident : public command_t
 
 	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		size_t len = 0;
-		for(const char* x = parameters[0]; *x; x++, len++)
+		if (!*parameters[0])
 		{
-			if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x))
-				continue;
-
-			user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick);
 			return CMD_FAILURE;
 		}
-		if (len > IDENTMAX)
+		
+		if (strlen(parameters[0]) > IDENTMAX)
 		{
-			user->WriteServ("NOTICE %s :*** Ident is too long", user->nick);
+			user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick);
 			return CMD_FAILURE;
 		}
-
+		
+		if (!ServerInstance->IsIdent(parameters[0]))
+		{
+			user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick);
+			return CMD_FAILURE;
+		}
+		
 		user->ChangeIdent(parameters[0]);
 		ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
 
@@ -58,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);
@@ -71,34 +74,10 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
-	}
-	
-};
-
-// 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)