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

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 89ae02a08..e13d211f4 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,43 +1,66 @@
-#include <string>
+/*       +------------------------------------+
+ *       | 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"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
-Server *Srv;
-
-
+/** Handle /CHGIDENT
+ */
 class cmd_chgident : public command_t
 {
  public:
-	cmd_chgident() : command_t("CHGIDENT", 'o', 2)
+	cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
 	{
 		this->source = "m_chgident.so";
+		syntax = "<nick> <newident>";
 	}
 	
-	void Handle(char **parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		userrec* dest = Srv->FindNick(std::string(parameters[0]));
-		
-		if(dest)
+		userrec* dest = ServerInstance->FindNick(parameters[0]);
+
+		if (!dest)
+		{
+			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			return CMD_FAILURE;
+		}
+
+		if (!*parameters[1])
 		{
-			for(unsigned int x = 0; x < strlen(parameters[1]); x++)
-			{
-				if(((parameters[1][x] >= 'A') && (parameters[1][x] <= '}')) || strchr(".-0123456789", parameters[1][x]))
-					continue;
-			
-				WriteServ(user->fd, "NOTICE %s :*** Invalid characters in ident", user->nick);
-				return;
-			}
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick);
+			return CMD_FAILURE;
+		}
 		
-			WriteOpers("%s used CHGIDENT to change %s's host from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]);
-			strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+		if (strlen(parameters[1]) > IDENTMAX)
+		{
+			user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick);
+			return CMD_FAILURE;
 		}
-		else
+		
+		if (!ServerInstance->IsIdent(parameters[1]))
 		{
-			WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			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;
 	}
 };
 
@@ -46,12 +69,12 @@ class ModuleChgIdent : public Module
 {
 	cmd_chgident* mycommand;
 	
+	
 public:
-	ModuleChgIdent(Server* Me) : Module::Module(Me)
+	ModuleChgIdent(InspIRCd* Me) : Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_chgident();
-		Srv->AddCommand(mycommand);
+		mycommand = new cmd_chgident(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleChgIdent()
@@ -60,34 +83,10 @@ public:
 	
 	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 ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-	ModuleChgIdentFactory()
-	{
-	}
-	
-	~ModuleChgIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleChgIdent(Me);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)