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

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 7938f8b23..ad8353cbd 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -1,88 +1,108 @@
 /*
- *  CHGHOST module for InspIRCD
- *  Author: brain
- *  Version: 1.0.0.0
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Syntax: /CHGHOST [nick] [new name]
- *  Changes a users DHOST (oper only)
- *  
+ *   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 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 <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for the CHGHOST command */
+#include "inspircd.h"
 
-Server *Srv;
-	 
-void handle_chghost(char **parameters, int pcnt, userrec *user)
+/** Handle /CHGHOST
+ */
+class CommandChghost : public Command
 {
-	for (int x = 0; x < strlen(parameters[1]); x++)
+	char* hostmap;
+ public:
+	CommandChghost(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
 	{
-		if (((tolower(parameters[1][x]) < 'a') || (tolower(parameters[1][x]) > 'z')) && (parameters[1][x] != '.'))
+		allow_empty_last_param = false;
+		flags_needed = 'o';
+		syntax = "<nick> <newhost>";
+		TRANSLATE2(TR_NICK, TR_TEXT);
+	}
+
+	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+	{
+		if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost)
+		{
+			user->WriteNotice("*** CHGHOST: Host too long");
+			return CMD_FAILURE;
+		}
+
+		for (std::string::const_iterator x = parameters[1].begin(); x != parameters[1].end(); x++)
 		{
-			if (((parameters[1][x] < '0') || (parameters[1][x]> '9')) && (parameters[1][x] != '-'))
+			if (!hostmap[(unsigned char)*x])
 			{
-				Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-				return;
+				user->WriteNotice("*** CHGHOST: Invalid characters in hostname");
+				return CMD_FAILURE;
 			}
 		}
-	}	userrec* dest = Srv->FindNick(std::string(parameters[0]));
-	if (dest)
-	{
-		strncpy(dest->dhost,parameters[1],127);
-		Srv->SendOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+std::string(dest->nick)+" become "+std::string(parameters[1]));
-	}
-}
 
+		User* dest = ServerInstance->FindNick(parameters[0]);
 
-class ModuleChgHost : public Module
-{
- public:
-	ModuleChgHost()
-	{
-		Srv = new Server;
-		Srv->AddCommand("CHGHOST",handle_chghost,'o',2);
-	}
-	
-	virtual ~ModuleChgHost()
-	{
-		delete Srv;
+		// Allow services to change the host of unregistered users
+		if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsULine())))
+		{
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+			return CMD_FAILURE;
+		}
+
+		if (IS_LOCAL(dest))
+		{
+			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);
+			}
+		}
+
+		return CMD_SUCCESS;
 	}
-	
-	virtual Version GetVersion()
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return Version(1,0,0,0);
+		return ROUTE_OPT_UCAST(parameters[0]);
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleChgHostFactory : public ModuleFactory
+class ModuleChgHost : public Module
 {
+	CommandChghost cmd;
+	char hostmap[256];
+
  public:
-	ModuleChgHostFactory()
+	ModuleChgHost() : cmd(this, hostmap)
 	{
 	}
-	
-	~ModuleChgHostFactory()
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
+		std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
+
+		memset(hostmap, 0, sizeof(hostmap));
+		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+			hostmap[(unsigned char)*n] = 1;
 	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleChgHost;
+		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChgHostFactory;
-}
-
+MODULE_INIT(ModuleChgHost)