X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=6e984a62eab2aab8f38e3ab1c8a9a4a3c9d380a8;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=3803c716c0fac06c829b40e325304058997ceaaa;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 3803c716c..6e984a62e 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -2,91 +2,107 @@
  *       | 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 SETHOST command */
 
-
-extern InspIRCd* ServerInstance;
-
+/** Handle /SETHOST
+ */
 class cmd_sethost : public command_t
 {
+ private:
+	char* hostmap;
  public:
- cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
+	cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		if (strlen(parameters[0]) > 64)
-		{
-			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
-			return;
-		}
-		for (unsigned int x = 0; x < strlen(parameters[0]); x++)
+		size_t len = 0;
+		for (const char* x = parameters[0]; *x; x++, len++)
 		{
-			if (((tolower(parameters[0][x]) < 'a') || (tolower(parameters[0][x]) > 'z')) && (parameters[0][x] != '.'))
+			if (!hostmap[(unsigned char)*x])
 			{
-				if (((parameters[0][x] < '0') || (parameters[0][x]> '9')) && (parameters[0][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 (len > 64)
+		{
+			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
+			return CMD_FAILURE;
+		}
 		if (user->ChangeDisplayedHost(parameters[0]))
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0]));
+		{
+			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
 
 class ModuleSetHost : public Module
 {
-	cmd_sethost*	mycommand;
+	cmd_sethost* mycommand;
+	char hostmap[256];
  public:
 	ModuleSetHost(InspIRCd* Me)
 		: Module::Module(Me)
-	{
-		
-		mycommand = new cmd_sethost(ServerInstance);
+	{	
+		OnRehash(NULL,"");
+		mycommand = new cmd_sethost(ServerInstance, hostmap);
 		ServerInstance->AddCommand(mycommand);
 	}
-	
+
+	void Implements(char* List)
+	{
+		List[I_OnRehash] = 1;
+	}
+
+	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;
+	}
+
 	virtual ~ModuleSetHost()
 	{
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
 class ModuleSetHostFactory : public ModuleFactory
 {
  public: