X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=c327d27b32631780a54f8f665c2ac34714777738;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=3ce3d37bd85b471195f039658552dcbfda7cd0f6;hpb=6e7612767e4809fde98399b41ccea5fe964898d3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 3ce3d37bd..c327d27b3 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,90 +11,95 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
 
 /** Handle /CHGHOST
  */
-class cmd_chghost : public command_t
+class CommandChghost : public Command
 {
  private:
-	char*& hostmap;
+	char* hostmap;
  public:
-	cmd_chghost (InspIRCd* Instance, char* &hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
+	CommandChghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST","o",2), hostmap(hmap)
 	{
 		this->source = "m_chghost.so";
 		syntax = "<nick> <newhost>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
  
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		const char * x = parameters[1];
+		const char * x = parameters[1].c_str();
 
 		for (; *x; x++)
 		{
-			if (!strchr(hostmap, *x))
+			if (!hostmap[(unsigned char)*x])
 			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** CHGHOST: Invalid characters in hostname");
 				return CMD_FAILURE;
 			}
 		}
-		if ((parameters[1] - x) > 63)
+		if (parameters[0].empty())
 		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long",user->nick);
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick);
 			return CMD_FAILURE;
 		}
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
-		if (dest)
+		
+		if ((parameters[1].c_str() - x) > 63)
 		{
-			if ((dest->ChangeDisplayedHost(parameters[1])) && (!ServerInstance->ULine(user->server)))
-			{
-				// fix by brain - ulines set hosts silently
-				ServerInstance->WriteOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
-			}
-			return CMD_SUCCESS;
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick);
+			return CMD_FAILURE;
+		}
+		User* dest = ServerInstance->FindNick(parameters[0]);
+
+		if (!dest)
+		{
+			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, parameters[0].c_str());
+			return CMD_FAILURE;
 		}
 
-		return CMD_FAILURE;
+		if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server)))
+		{
+			// fix by brain - ulines set hosts silently
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+		}
+
+		/* route it! */
+		return CMD_SUCCESS;
+
 	}
 };
 
 
 class ModuleChgHost : public Module
 {
-	cmd_chghost* mycommand;
-	char* hostmap;
-	std::string hmap;
+	CommandChghost* mycommand;
+	char hostmap[256];
  public:
 	ModuleChgHost(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		OnRehash("");
-		mycommand = new cmd_chghost(ServerInstance, hostmap);
+		OnRehash(NULL,"");
+		mycommand = new CommandChghost(ServerInstance, hostmap);
 		ServerInstance->AddCommand(mycommand);
+		Implementation eventlist[] = { I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = 1;
-	}
 	
-	void OnRehash(const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
-		hmap = Conf.ReadValue("hostname", "charmap", 0);
+		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
 		if (hmap.empty())
-			hostmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
-		else
-			hostmap = (char*)hmap.c_str();
+			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+
+		memset(&hostmap, 0, 255);
+		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+			hostmap[(unsigned char)*n] = 1;
 	}
 
 	~ModuleChgHost()
@@ -103,33 +108,9 @@ class ModuleChgHost : public Module
 	
 	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-
-class ModuleChgHostFactory : public ModuleFactory
-{
- public:
-	ModuleChgHostFactory()
-	{
-	}
-	
-	~ModuleChgHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChgHost(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgHostFactory;
-}
-
+MODULE_INIT(ModuleChgHost)