X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=08d3e6b664249ea4497460a3a2e89fcded3fdd67;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=c77a3f85f56068937945ddd9adefbc43ac1feee5;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index c77a3f85f..08d3e6b66 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -12,43 +12,44 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
 
-static ConfigReader* Conf;
-
 /** Handle /VHOST
  */
-class cmd_vhost : public command_t
+class CommandVhost : public Command
 {
  public:
-	cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2)
+	CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
 	{
 		this->source = "m_vhost.so";
 		syntax = "<username> <password>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
+		ConfigReader *Conf = new ConfigReader(ServerInstance);
+
 		for (int index = 0; index < Conf->Enumerate("vhost"); index++)
 		{
 			std::string mask = Conf->ReadValue("vhost","host",index);
 			std::string username = Conf->ReadValue("vhost","user",index);
 			std::string pass = Conf->ReadValue("vhost","pass",index);
+
 			if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
 			{
 				if (!mask.empty())
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
 					user->ChangeDisplayedHost(mask.c_str());
-					return CMD_FAILURE;
+					delete Conf;
+					return CMD_LOCALONLY;
 				}
 			}
 		}
+
 		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		delete Conf;
 		return CMD_FAILURE;
 	}
 };
@@ -57,33 +58,23 @@ class ModuleVHost : public Module
 {
  private:
 
-	cmd_vhost* mycommand;
+	CommandVhost* mycommand;
 	 
  public:
 	ModuleVHost(InspIRCd* Me) : Module(Me)
 	{
-		
-		Conf = new ConfigReader(ServerInstance);
-		mycommand = new cmd_vhost(ServerInstance);
+		mycommand = new CommandVhost(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleVHost()
 	{
-		DELETE(Conf);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
-	{
-		DELETE(Conf);
-		Conf = new ConfigReader(ServerInstance);
-	}
-	
 	virtual Version GetVersion()
 	{
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);