X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=3634f18983f862d6966b072bcfd3b06784e0898f;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=6e984a62eab2aab8f38e3ab1c8a9a4a3c9d380a8;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 6e984a62e..3634f1898 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -11,48 +11,48 @@
  * ---------------------------------------------------
  */
 
-#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, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+	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 (!hostmap[(unsigned char)*x])
+			if (!hostmap[(const unsigned char)*x])
 			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+				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;
 		}
 
@@ -63,31 +63,28 @@ 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)
-	{	
-		OnRehash(NULL,"");
-		mycommand = new cmd_sethost(ServerInstance, hostmap);
-		ServerInstance->AddCommand(mycommand);
-	}
-
-	void Implements(char* List)
+	ModuleSetHost()
+		: cmd(this, hostmap)
 	{
-		List[I_OnRehash] = 1;
+		OnRehash(NULL);
+		ServerInstance->AddCommand(&cmd);
+		Implementation eventlist[] = { I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+
+	void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
 		if (hmap.empty())
 			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
 
-		memset(&hostmap, 0, 255);
+		memset(hostmap, 0, sizeof(hostmap));
 		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
 			hostmap[(unsigned char)*n] = 1;
 	}
@@ -95,35 +92,12 @@ class ModuleSetHost : public Module
 	virtual ~ModuleSetHost()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Provides support for the SETHOST command", VF_VENDOR);
 	}
-	
-};
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-	ModuleSetHostFactory()
-	{
-	}
-	
-	~ModuleSetHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetHost(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)