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

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index c1a6b3f07..e13d211f4 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
@@ -33,23 +32,35 @@ class cmd_chgident : public command_t
 	{
 		userrec* dest = ServerInstance->FindNick(parameters[0]);
 
-		if(dest)
+		if (!dest)
 		{
-			if(!ServerInstance->IsIdent(parameters[1]))
-			{
-				user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-				return CMD_FAILURE;
-			}
+			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			return CMD_FAILURE;
+		}
 
-			dest->ChangeIdent(parameters[1]);
-			ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
-			return CMD_SUCCESS;
+		if (!*parameters[1])
+		{
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick);
+			return CMD_FAILURE;
 		}
-		else
+		
+		if (strlen(parameters[1]) > IDENTMAX)
 		{
-			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick);
 			return CMD_FAILURE;
 		}
+		
+		if (!ServerInstance->IsIdent(parameters[1]))
+		{
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick);
+			return CMD_FAILURE;
+		}
+
+		dest->ChangeIdent(parameters[1]);
+		ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
+
+		/* route it! */
+		return CMD_SUCCESS;
 	}
 };
 
@@ -60,7 +71,7 @@ class ModuleChgIdent : public Module
 	
 	
 public:
-	ModuleChgIdent(InspIRCd* Me) : Module::Module(Me)
+	ModuleChgIdent(InspIRCd* Me) : Module(Me)
 	{
 		mycommand = new cmd_chgident(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
@@ -72,34 +83,10 @@ public:
 	
 	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 ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-	ModuleChgIdentFactory()
-	{
-	}
-	
-	~ModuleChgIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChgIdent(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)