X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=eb6c3e38e151c276d0fc74aac63b52d40e810370;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=f419772d4d0f2d90754ad274d9224294469565ad;hpb=5d407fb44c759524881712a80febb86b4506ddbf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index f419772d4..eb6c3e38e 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -20,21 +20,23 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
 
 static ConfigReader *Conf;
-static Server* Srv;
+
 
 class cmd_vhost : public command_t
 {
  public:
-	cmd_vhost() : command_t("VHOST", 0, 2)
+ cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2)
 	{
 		this->source = "m_vhost.so";
+		syntax = "<username> <password>";
 	}
 
-	void Handle (char **parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		for (int index = 0; index < Conf->Enumerate("vhost"); index++)
 		{
@@ -45,13 +47,14 @@ class cmd_vhost : public command_t
 			{
 				if (mask != "")
 				{
-					Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
-					Srv->ChangeHost(user,mask);
-					return;
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
+					user->ChangeDisplayedHost(mask.c_str());
+					return CMD_FAILURE;
 				}
 			}
 		}
-		Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		return CMD_FAILURE;
 	}
 };
 
@@ -62,12 +65,12 @@ class ModuleVHost : public Module
 	cmd_vhost* mycommand;
 	 
  public:
-	ModuleVHost(Server* Me) : Module::Module(Me)
+	ModuleVHost(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		Conf = new ConfigReader;
-		mycommand = new cmd_vhost();
-		Srv->AddCommand(mycommand);
+		
+		Conf = new ConfigReader(ServerInstance);
+		mycommand = new cmd_vhost(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleVHost()
@@ -83,7 +86,7 @@ class ModuleVHost : public Module
 	virtual void OnRehash(const std::string &parameter)
 	{
 		DELETE(Conf);
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual Version GetVersion()
@@ -108,7 +111,7 @@ class ModuleVHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleVHost(Me);
 	}