X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=1425204b45f2e5f24e49a6988c51a03b417c1207;hb=226a95aab09b9e1f43f61e78179bfa1135816c2d;hp=3634f18983f862d6966b072bcfd3b06784e0898f;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 3634f1898..1425204b4 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
@@ -19,11 +27,12 @@
  */
 class CommandSethost : public Command
 {
- private:
 	char* hostmap;
+
  public:
 	CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
 	{
+		allow_empty_last_param = false;
 		flags_needed = 'o'; syntax = "<new-hostname>";
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
@@ -35,24 +44,20 @@ class CommandSethost : public Command
 		{
 			if (!hostmap[(const unsigned char)*x])
 			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
+				user->WriteNotice("*** 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.c_str());
+			user->WriteNotice("*** SETHOST: Host too long");
 			return CMD_FAILURE;
 		}
 
 		if (user->ChangeDisplayedHost(parameters[0].c_str()))
 		{
-			ServerInstance->SNO->WriteGlobalSno('a', 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->dhost);
 			return CMD_SUCCESS;
 		}
 
@@ -65,39 +70,34 @@ class ModuleSetHost : public Module
 {
 	CommandSethost cmd;
 	char hostmap[256];
+
  public:
 	ModuleSetHost()
 		: cmd(this, hostmap)
+	{
+	}
+
+	void init()
 	{
 		OnRehash(NULL);
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 		Implementation eventlist[] = { I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
 	void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
-
-		if (hmap.empty())
-			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+		std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
 
 		memset(hostmap, 0, sizeof(hostmap));
 		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
 			hostmap[(unsigned char)*n] = 1;
 	}
 
-	virtual ~ModuleSetHost()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for the SETHOST command", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSetHost)