X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=f5ee54f6cc05980011828a0058038bbe5ee74939;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=2a0280d2e7417145cd2befc2639be2920bdfe286;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 2a0280d2e..f5ee54f6c 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,45 +11,46 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#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;
-
 /** 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 std::vector<std::string> &parameters, 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())))
+			std::string hash = Conf->ReadValue("vhost","hash",index);
+
+			if ((!strcmp(parameters[0].c_str(),username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()))
 			{
-				if (mask != "")
+				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;
 	}
 };
@@ -58,63 +59,27 @@ class ModuleVHost : public Module
 {
  private:
 
-	cmd_vhost* mycommand;
-	 
+	CommandVhost* mycommand;
+
  public:
-	ModuleVHost(InspIRCd* Me) : Module::Module(Me)
+	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(const std::string &parameter)
-	{
-		DELETE(Conf);
-		Conf = new ConfigReader(ServerInstance);
-	}
-	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
-	
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleVHostFactory : public ModuleFactory
-{
- public:
-	ModuleVHostFactory()
-	{
-	}
-	
-	~ModuleVHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleVHost(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleVHostFactory;
-}
+MODULE_INIT(ModuleVHost)