X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=6884fd35a6655e2c5b6aeb1a0d63622d69e03524;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=67b39cb665fb3c72c79e4d56b0d40fd66dd62b7c;hpb=d185decae97752368d5cf62311cbc0d1a52aa22c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 67b39cb66..6884fd35a 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-2008 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.
@@ -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(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
 	{
-		this->source = "m_chghost.so";
+		flags_needed = 'o';
 		syntax = "<nick> <newhost>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		const char * x = parameters[1].c_str();
+		const char* x = parameters[1].c_str();
 
 		for (; *x; x++)
 		{
@@ -41,11 +41,6 @@ class CommandChghost : public Command
 				return CMD_FAILURE;
 			}
 		}
-		if (parameters[0].empty())
-		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick.c_str());
-			return CMD_FAILURE;
-		}
 
 		if ((parameters[1].c_str() - x) > 63)
 		{
@@ -56,7 +51,7 @@ class CommandChghost : public Command
 
 		if (!dest)
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
@@ -65,45 +60,46 @@ class CommandChghost : public Command
 			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);
+				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! */
 		return CMD_SUCCESS;
+	}
 
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
 };
 
 
 class ModuleChgHost : public Module
 {
-	CommandChghost* mycommand;
+	CommandChghost cmd;
 	char hostmap[256];
  public:
-	ModuleChgHost(InspIRCd* Me)
-		: Module(Me)
+	ModuleChgHost() : cmd(this, hostmap)
 	{
-		OnRehash(NULL,"");
-		mycommand = new CommandChghost(ServerInstance, hostmap);
-		ServerInstance->AddCommand(mycommand);
+		OnRehash(NULL);
+		ServerInstance->AddCommand(&cmd);
 		Implementation eventlist[] = { I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
 
-	void OnRehash(User* user, const std::string &parameter)
+	void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
 		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;
 	}
@@ -114,7 +110,7 @@ class ModuleChgHost : public Module
 
 	Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };