X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=3634f18983f862d6966b072bcfd3b06784e0898f;hb=e071bd88391e00e4d3b0104ada985e08a9eb3210;hp=7e66e40b249c1091ef03a1e0d1d4b70265066019;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 7e66e40b2..3634f1898 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -2,63 +2,57 @@
  *       | 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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 "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
 
 /** Handle /SETHOST
  */
-class cmd_sethost : public command_t
+class CommandSethost : public Command
 {
+ private:
+	char* hostmap;
  public:
-	cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
+	CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
 	{
-		this->source = "m_sethost.so";
-		syntax = "<new-hostname>";
+		flags_needed = 'o'; syntax = "<new-hostname>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
 		size_t len = 0;
-		for (const char* x = parameters[0]; *x; x++, len++)
+		for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++, len++)
 		{
-			if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
+			if (!hostmap[(const unsigned char)*x])
 			{
-				if (((*x < '0') || (*x> '9')) && (*x != '-'))
-				{
-					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-					return CMD_FAILURE;
-				}
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
+				return CMD_FAILURE;
 			}
 		}
+		if (len == 0)
+		{
+			user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick.c_str());
+			return CMD_FAILURE;
+		}
 		if (len > 64)
 		{
-			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
+			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick.c_str());
 			return CMD_FAILURE;
 		}
-		if (user->ChangeDisplayedHost(parameters[0]))
+
+		if (user->ChangeDisplayedHost(parameters[0].c_str()))
 		{
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
 			return CMD_SUCCESS;
 		}
 
@@ -69,50 +63,41 @@ class cmd_sethost : public command_t
 
 class ModuleSetHost : public Module
 {
-	cmd_sethost*	mycommand;
+	CommandSethost cmd;
+	char hostmap[256];
  public:
-	ModuleSetHost(InspIRCd* Me)
-		: Module::Module(Me)
-	{
-		
-		mycommand = new cmd_sethost(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSetHost()
-	{
-	}
-	
-	virtual Version GetVersion()
+	ModuleSetHost()
+		: cmd(this, hostmap)
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		OnRehash(NULL);
+		ServerInstance->AddCommand(&cmd);
+		Implementation eventlist[] = { I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
-	
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-	ModuleSetHostFactory()
+	void OnRehash(User* user)
 	{
+		ConfigReader Conf;
+		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
+
+		if (hmap.empty())
+			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+
+		memset(hostmap, 0, sizeof(hostmap));
+		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+			hostmap[(unsigned char)*n] = 1;
 	}
-	
-	~ModuleSetHostFactory()
+
+	virtual ~ModuleSetHost()
 	{
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleSetHost(Me);
+		return Version("Provides support for the SETHOST command", VF_VENDOR);
 	}
-	
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)