X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=6787867577d38ba997053e7d0f4d53bce81b480c;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=7244ba6def82365e11b254354620c4dc3f172f8f;hpb=e2e581f0d3d5d844dc4b5210f566e5a5571a0570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 7244ba6de..678786757 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -21,40 +21,49 @@ 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;
+
+
 
 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 (char **parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		if (strlen(parameters[0]) > 64)
-		{
-			WriteServ(user->fd,"NOTICE %s :*** SETHOST: Host too long",user->nick);
-			return;
-		}
-		for (unsigned int x = 0; x < strlen(parameters[0]); x++)
+		size_t len = 0;
+		for (const char* x = parameters[0]; *x; x++, len++)
 		{
-			if (((tolower(parameters[0][x]) < 'a') || (tolower(parameters[0][x]) > 'z')) && (parameters[0][x] != '.'))
+			if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.'))
 			{
-				if (((parameters[0][x] < '0') || (parameters[0][x]> '9')) && (parameters[0][x] != '-'))
+				if (((*x < '0') || (*x> '9')) && (*x != '-'))
 				{
-					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
-					return;
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+					return CMD_FAILURE;
 				}
 			}
 		}
-		Srv->ChangeHost(user,parameters[0]);
-		Srv->SendOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0]));
+		if (len > 64)
+		{
+			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
+			return CMD_FAILURE;
+		}
+		if (user->ChangeDisplayedHost(parameters[0]))
+		{
+			ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -63,12 +72,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()
@@ -77,7 +86,7 @@ class ModuleSetHost : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -95,7 +104,7 @@ class ModuleSetHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSetHost(Me);
 	}