X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=87eed402284bbd09a3dc31ece342ff9ce6a6fcab;hb=db5610a5640749ab7dafab82c1ef1553f3d78615;hp=441d2f3965e35499df3783ab2b27d3a1fa2817dc;hpb=364735e18b500f0a071fab4cc5c9e7bace1835fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 441d2f396..87eed4022 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -1,64 +1,60 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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/>.
  */
 
-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
 {
  public:
-	cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
+	std::bitset<UCHAR_MAX> hostmap;
+
+	CommandSethost(Module* Creator)
+		: Command(Creator,"SETHOST", 1)
 	{
-		this->source = "m_sethost.so";
-		syntax = "<new-hostname>";
+		allow_empty_last_param = false;
+		flags_needed = 'o'; syntax = "<new-hostname>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		size_t len = 0;
-		for (const char* x = parameters[0]; *x; x++, len++)
+		if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost)
 		{
-			if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
-			{
-				if (((*x < '0') || (*x> '9')) && (*x != '-'))
-				{
-					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-					return CMD_FAILURE;
-				}
-			}
+			user->WriteNotice("*** SETHOST: Host too long");
+			return CMD_FAILURE;
 		}
-		if (len > 64)
+
+		for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++)
 		{
-			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
-			return CMD_FAILURE;
+			if (!hostmap.test(static_cast<unsigned char>(*x)))
+			{
+				user->WriteNotice("*** SETHOST: Invalid characters in hostname");
+				return CMD_FAILURE;
+			}
 		}
+
 		if (user->ChangeDisplayedHost(parameters[0]))
 		{
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->GetDisplayedHost());
 			return CMD_SUCCESS;
 		}
 
@@ -69,50 +65,27 @@ class cmd_sethost : public command_t
 
 class ModuleSetHost : public Module
 {
-	cmd_sethost*	mycommand;
- public:
-	ModuleSetHost(InspIRCd* Me)
-		: Module::Module(Me)
-	{
-		
-		mycommand = new cmd_sethost(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleSetHost()
-	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
-	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+	CommandSethost cmd;
 
-class ModuleSetHostFactory : public ModuleFactory
-{
  public:
-	ModuleSetHostFactory()
+	ModuleSetHost()
+		: cmd(this)
 	{
 	}
-	
-	~ModuleSetHostFactory()
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
+		std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
+
+		cmd.hostmap.reset();
+		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+			cmd.hostmap.set(static_cast<unsigned char>(*n));
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		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)