X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=ad8353cbd54191ad0efbb30da8f66512f2baf6a0;hb=52727673077afcb7377cef7491d3bdf9ab1c372e;hp=a30e700995016bf6b6b6c6d4818e3efd4276a8ce;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index a30e70099..ad8353cbd 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -1,117 +1,108 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for the CHGHOST command */
+#include "inspircd.h"
 
 /** 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(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
 	{
-		this->source = "m_chghost.so";
+		allow_empty_last_param = false;
+		flags_needed = 'o';
 		syntax = "<nick> <newhost>";
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
- 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		const char * x = parameters[1];
+		if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost)
+		{
+			user->WriteNotice("*** CHGHOST: Host too long");
+			return CMD_FAILURE;
+		}
 
-		for (; *x; x++)
+		for (std::string::const_iterator x = parameters[1].begin(); x != parameters[1].end(); x++)
 		{
 			if (!hostmap[(unsigned char)*x])
 			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** CHGHOST: Invalid characters in hostname");
+				user->WriteNotice("*** CHGHOST: Invalid characters in hostname");
 				return CMD_FAILURE;
 			}
 		}
-		if (!*parameters[0])
-		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick);
-			return CMD_FAILURE;
-		}
-		
-		if ((parameters[1] - x) > 63)
-		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick);
-			return CMD_FAILURE;
-		}
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
 
-		if (!dest)
+		User* dest = ServerInstance->FindNick(parameters[0]);
+
+		// Allow services to change the host of unregistered users
+		if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsULine())))
 		{
-			user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			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])) && (!user->server->IsULine()))
+			{
+				// fix by brain - ulines set hosts silently
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+			}
 		}
 
-		/* route it! */
 		return CMD_SUCCESS;
+	}
 
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_OPT_UCAST(parameters[0]);
 	}
 };
 
 
 class ModuleChgHost : public Module
 {
-	cmd_chghost* mycommand;
+	CommandChghost cmd;
 	char hostmap[256];
+
  public:
-	ModuleChgHost(InspIRCd* Me)
-		: Module(Me)
+	ModuleChgHost() : cmd(this, hostmap)
 	{
-		OnRehash(NULL,"");
-		mycommand = new cmd_chghost(ServerInstance, hostmap);
-		ServerInstance->AddCommand(mycommand);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = 1;
-	}
-	
-	void OnRehash(userrec* user, const std::string &parameter)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ConfigReader Conf(ServerInstance);
-		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
+		std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
 
-		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;
 	}
 
-	~ModuleChgHost()
-	{
-	}
-	
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
 };
 
 MODULE_INIT(ModuleChgHost)