X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=5189ec141e36816b9d3eb3b4283c196137236d8c;hb=f1712e6f0b58098250791ffc60815fa3fc462607;hp=20b669f22e8c58a371b2dc74d2c24f84e31b91c4;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 20b669f22..5189ec141 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -22,16 +22,16 @@ class CommandChghost : public Command
  private:
 	char* hostmap;
  public:
-	CommandChghost (InspIRCd* Instance, char* hmap) : Command(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, User *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++)
 		{
@@ -41,29 +41,35 @@ class CommandChghost : public Command
 				return CMD_FAILURE;
 			}
 		}
-		if (!*parameters[0])
+		if (parameters[0].empty())
 		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick);
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick.c_str());
 			return CMD_FAILURE;
 		}
-		
-		if ((parameters[1] - x) > 63)
+
+		if ((parameters[1].c_str() - x) > 63)
 		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick);
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str());
 			return CMD_FAILURE;
 		}
 		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
-			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			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->WriteToSnoMask('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! */
@@ -88,7 +94,7 @@ class ModuleChgHost : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	
+
 	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
@@ -97,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;
 	}
@@ -105,12 +111,12 @@ class ModuleChgHost : public Module
 	~ModuleChgHost()
 	{
 	}
-	
+
 	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleChgHost)