X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=966b9b602bc63e01aacb40b61f537870d8ce7430;hb=dd36852a52e8541306b76c5b88bce8ab9b36654c;hp=ecc5948871ac0b56d3ffaddcb651a5175622e868;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index ecc594887..966b9b602 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,39 +1,54 @@
-#include "users.h"
-#include "modules.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 */
 
 /** Handle /SETIDENT
  */
-class cmd_setident : public command_t
+class CommandSetident : public Command
 {
  public:
- cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1)
+ CommandSetident (InspIRCd* Instance) : Command(Instance,"SETIDENT", "o", 1)
 	{
 		this->source = "m_setident.so";
 		syntax = "<new-ident>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char* const* parameters, int pcnt, User *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);
+		ServerInstance->SNO->WriteToSnoMask('A', "%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
 
 		return CMD_SUCCESS;
 	}
@@ -42,14 +57,15 @@ class cmd_setident : public command_t
 
 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(ServerInstance);
+		mycommand = new CommandSetident(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleSetIdent()
@@ -58,34 +74,10 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version(1, 1, 0, 0, VF_COMMON | 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);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
 
+MODULE_INIT(ModuleSetIdent)