X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=f3f7f6387e6b6cc1cc488527e18c098150f8b465;hb=9cf56d917d92959701694477f7944d45ad2c38ed;hp=fc5507822eb927bf7298ff01c0f921b93bc860a9;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index fc5507822..f3f7f6387 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -2,71 +2,72 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-
+/** Handle /CHGHOST
+ */
 class cmd_chghost : public command_t
 {
+ private:
+	char* hostmap;
  public:
-	cmd_chghost () : command_t("CHGHOST",'o',2)
+	cmd_chghost (InspIRCd* Instance, char* hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
 	{
 		this->source = "m_chghost.so";
 		syntax = "<nick> <newhost>";
 	}
-	 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+ 
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
 		const char * x = parameters[1];
 
 		for (; *x; x++)
 		{
-			if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
+			if (!hostmap[(unsigned char)*x])
 			{
-				if (((*x < '0') || (*x > '9')) && (*x != '-'))
-				{
-					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-					return;
-				}
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+				return CMD_FAILURE;
 			}
 		}
 		if ((parameters[1] - x) > 63)
 		{
 			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long",user->nick);
-			return;
+			return CMD_FAILURE;
 		}
 		userrec* dest = ServerInstance->FindNick(parameters[0]);
-		if (dest)
+
+		if (!dest)
 		{
-			if ((dest->ChangeDisplayedHost(parameters[1])) && (!Srv->IsUlined(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 "+parameters[1]);
-			}
+			/* Drop it like a hot potato. XXX - we should probably message here.. -- w00t */
+			return CMD_FAILURE;
+		}
+
+		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);
 		}
+
+		/* route it! */
+		return CMD_SUCCESS;
+
 	}
 };
 
@@ -74,31 +75,45 @@ class cmd_chghost : public command_t
 class ModuleChgHost : public Module
 {
 	cmd_chghost* mycommand;
+	char hostmap[256];
  public:
-	ModuleChgHost(Server* Me)
-		: Module::Module(Me)
+	ModuleChgHost(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_chghost();
-		Srv->AddCommand(mycommand);
+		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()
 	{
 	}
 	
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR);
+		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
 {
@@ -111,7 +126,7 @@ class ModuleChgHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleChgHost(Me);
 	}
@@ -119,7 +134,7 @@ class ModuleChgHostFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleChgHostFactory;
 }