X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=981efbbd810a7c77cba114834b89c03975bcf735;hb=05cc48f1894e40f8a34496bf54a60d8b911e6a5e;hp=62b6bda833a153fc066809d4bdde97b05702427c;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 62b6bda83..981efbbd8 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,40 +11,40 @@
  * ---------------------------------------------------
  */
 
-#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 (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST","o",1), hostmap(hmap)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
 		size_t len = 0;
 		for (const char* x = parameters[0]; *x; x++, len++)
 		{
 			if (!hostmap[(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);
+			return CMD_FAILURE;
+		}
 		if (len > 64)
 		{
 			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
@@ -52,7 +52,7 @@ class cmd_sethost : public command_t
 		}
 		if (user->ChangeDisplayedHost(parameters[0]))
 		{
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
 			return CMD_SUCCESS;
 		}
 
@@ -63,23 +63,21 @@ class cmd_sethost : public command_t
 
 class ModuleSetHost : public Module
 {
-	cmd_sethost* mycommand;
+	CommandSethost* mycommand;
 	char hostmap[256];
  public:
 	ModuleSetHost(InspIRCd* Me)
 		: Module(Me)
 	{	
 		OnRehash(NULL,"");
-		mycommand = new cmd_sethost(ServerInstance, hostmap);
+		mycommand = new CommandSethost(ServerInstance, hostmap);
 		ServerInstance->AddCommand(mycommand);
+		Implementation eventlist[] = { I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = 1;
-	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
@@ -98,32 +96,9 @@ class ModuleSetHost : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-	
-};
-
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-	ModuleSetHostFactory()
-	{
-	}
-	
-	~ModuleSetHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetHost(Me);
+		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)