X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=d4047ad4828a0c3807cb589660e12d4aadf6b5ce;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;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..d4047ad48 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -1,11 +1,14 @@
-/*
- *  CHGHOST module for InspIRCD
- *  Author: brain
- *  Version: 1.0.0.0
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
  *
- *  Syntax: /CHGHOST [nick] [new name]
- *  Changes a users DHOST (oper only)
- *  
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
  */
 
 #include <stdio.h>
@@ -14,53 +17,98 @@
 #include "channels.h"
 #include "modules.h"
 
+#include "inspircd.h"
+
 /* $ModDesc: Provides support for the CHGHOST command */
 
-Server *Srv;
-	 
-void handle_chghost(char **parameters, int pcnt, userrec *user)
+/** Handle /CHGHOST
+ */
+class cmd_chghost : public command_t
 {
-	for (int x = 0; x < strlen(parameters[1]); x++)
+ private:
+	char* hostmap;
+ public:
+	cmd_chghost (InspIRCd* Instance, char* hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
+	{
+		this->source = "m_chghost.so";
+		syntax = "<nick> <newhost>";
+	}
+ 
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		if (((tolower(parameters[1][x]) < 'a') || (tolower(parameters[1][x]) > 'z')) && (parameters[1][x] != '.'))
+		const char * x = parameters[1];
+
+		for (; *x; 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->WriteServ("NOTICE "+std::string(user->nick)+" :*** 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]));
+		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)
+		{
+			if ((dest->ChangeDisplayedHost(parameters[1])) && (!ServerInstance->ULine(user->server)))
+			{
+				// 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);
+			}
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
-}
+};
 
 
 class ModuleChgHost : public Module
 {
+	cmd_chghost* mycommand;
+	char hostmap[256];
  public:
-	ModuleChgHost()
+	ModuleChgHost(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("CHGHOST",handle_chghost,'o',2);
+		OnRehash(NULL,"");
+		mycommand = new cmd_chghost(ServerInstance, hostmap);
+		ServerInstance->AddCommand(mycommand);
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnRehash] = 1;
 	}
 	
-	virtual ~ModuleChgHost()
+	void OnRehash(userrec* user, const std::string &parameter)
+	{
+		ConfigReader Conf(ServerInstance);
+		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
+
+		if (hmap.empty())
+			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+
+		memset(&hostmap, 0, 255);
+		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+			hostmap[(unsigned char)*n] = 1;
+	}
+
+	~ModuleChgHost()
 	{
-		delete Srv;
 	}
 	
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
 class ModuleChgHostFactory : public ModuleFactory
 {
@@ -73,9 +121,9 @@ class ModuleChgHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleChgHost;
+		return new ModuleChgHost(Me);
 	}
 	
 };