X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=fb3d68529a953625105bad9e01025ee843e75cac;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=697ba1dfde524678f39e0b857d103a13560e1c91;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 697ba1dfd..fb3d68529 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -21,29 +21,29 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
 
 class cmd_sethost : public command_t
 {
  public:
-	cmd_sethost() : command_t("SETHOST",'o',1)
+	cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		if (strlen(parameters[0]) > 64)
 		{
 			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
-			return;
+			return CMD_FAILURE;
 		}
 		for (unsigned int x = 0; x < strlen(parameters[0]); x++)
 		{
@@ -52,12 +52,17 @@ class cmd_sethost : public command_t
 				if (((parameters[0][x] < '0') || (parameters[0][x]> '9')) && (parameters[0][x] != '-'))
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-					return;
+					return CMD_FAILURE;
 				}
 			}
 		}
 		if (user->ChangeDisplayedHost(parameters[0]))
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0]));
+		{
+			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -66,12 +71,12 @@ class ModuleSetHost : public Module
 {
 	cmd_sethost*	mycommand;
  public:
-	ModuleSetHost(Server* Me)
+	ModuleSetHost(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_sethost();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_sethost(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSetHost()
@@ -98,7 +103,7 @@ class ModuleSetHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSetHost(Me);
 	}