X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=4e2725af4b9a077bfa895b78e497fe8e6bc9040a;hb=8a5a800a87e657247bc619fbc669ba40f6bafc79;hp=c5e114575c090b13efa98923ae363976dd226fa8;hpb=d99c2c1ea74383a66b36582ccd364802c7223833;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index c5e114575..4e2725af4 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,54 +12,64 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
 
 /** Handle /CHGHOST
  */
-class cmd_chghost : public command_t
+class CommandChghost : public Command
 {
  private:
 	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 (!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[1].empty())
 		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long",user->nick);
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick.c_str());
 			return CMD_FAILURE;
 		}
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+
+		if ((parameters[1].c_str() - x) > 63)
+		{
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
-			/* Drop it like a hot potato. XXX - we should probably message here.. -- w00t */
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
-		if ((dest->ChangeDisplayedHost(parameters[1])) && (!ServerInstance->ULine(user->server)))
+		if (IS_LOCAL(dest))
 		{
-			// 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);
+			if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server)))
+			{
+				// fix by brain - ulines set hosts silently
+				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+			}
+
+			/* ChangeDisplayedHost fixes it for us */
+			return CMD_LOCALONLY;
 		}
 
 		/* route it! */
@@ -71,23 +81,21 @@ class cmd_chghost : public command_t
 
 class ModuleChgHost : public Module
 {
-	cmd_chghost* mycommand;
+	CommandChghost* mycommand;
 	char hostmap[256];
  public:
 	ModuleChgHost(InspIRCd* Me)
 		: Module(Me)
 	{
 		OnRehash(NULL,"");
-		mycommand = new cmd_chghost(ServerInstance, hostmap);
+		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(userrec* user, const std::string &parameter)
+
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
@@ -95,7 +103,7 @@ class ModuleChgHost : public Module
 		if (hmap.empty())
 			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
 
-		memset(&hostmap, 0, 255);
+		memset(hostmap, 0, sizeof(hostmap));
 		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
 			hostmap[(unsigned char)*n] = 1;
 	}
@@ -103,12 +111,12 @@ class ModuleChgHost : public Module
 	~ModuleChgHost()
 	{
 	}
-	
+
 	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
-MODULE_INIT(ModuleChgHost);
+MODULE_INIT(ModuleChgHost)