X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=f1a074aec8aeb79f569c65c916658ba8547e3d57;hb=4a64082e31c3c3dfa97a1edfb8a3c97fe8d32ea7;hp=d4ccba276f8d72e4a11317f9314ae0f4a2d723ac;hpb=638381c529a2f19c699718234d689e54ad459c97;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index d4ccba276..f1a074aec 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,15 +20,14 @@
 class CommandVhost : public Command
 {
  public:
-	CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
+	CommandVhost(Module* Creator) : Command(Creator,"VHOST", 2)
 	{
-		this->source = "m_vhost.so";
 		syntax = "<username> <password>";
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		ConfigReader *Conf = new ConfigReader(ServerInstance);
+		ConfigReader *Conf = new ConfigReader;
 
 		for (int index = 0; index < Conf->Enumerate("vhost"); index++)
 		{
@@ -37,14 +36,14 @@ class CommandVhost : public Command
 			std::string pass = Conf->ReadValue("vhost","pass",index);
 			std::string hash = Conf->ReadValue("vhost","hash",index);
 
-			if ((!strcmp(parameters[0],username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1], hash.c_str()))
+			if ((!strcmp(parameters[0].c_str(),username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()))
 			{
 				if (!mask.empty())
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
 					user->ChangeDisplayedHost(mask.c_str());
 					delete Conf;
-					return CMD_LOCALONLY;
+					return CMD_SUCCESS;
 				}
 			}
 		}
@@ -58,17 +57,14 @@ class CommandVhost : public Command
 class ModuleVHost : public Module
 {
  private:
+	CommandVhost cmd;
 
-	CommandVhost* mycommand;
-	 
  public:
-	ModuleVHost(InspIRCd* Me) : Module(Me)
+	ModuleVHost() : cmd(this)
 	{
-		mycommand = new CommandVhost(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleVHost()
 	{
 	}
@@ -76,9 +72,9 @@ class ModuleVHost : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR,API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleVHost)