X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=59810996680775174cd8624c54b95eebe966a4bb;hb=dd36852a52e8541306b76c5b88bce8ab9b36654c;hp=df2ff747e87cc7d10178cce3c29630b658fc5ac5;hpb=3f66ffb01489d45acf120a5831f09fc8083a4a5e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index df2ff747e..598109966 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,123 +2,84 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#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;
-static Server* Srv;
-
-class cmd_vhost : public command_t
+/** Handle /VHOST
+ */
+class CommandVhost : public Command
 {
  public:
-        cmd_vhost() : command_t("VHOST", 0, 2)
-        {
-                this->source = "m_vhost.so";
-        }
+	CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
+	{
+		this->source = "m_vhost.so";
+		syntax = "<username> <password>";
+	}
+
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	{
+		ConfigReader *Conf = new ConfigReader(ServerInstance);
 
-        void Handle (char **parameters, int pcnt, userrec *user)
-        {
-                for (int index = 0; index < Conf->Enumerate("vhost"); index++)
-                {
-                        std::string mask = Conf->ReadValue("vhost","host",index);
+		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 != "")
-                                {
-                                        Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
-                                        Srv->ChangeHost(user,mask);
-                                        return;
-                                }
-                        }
-                }
-		Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid username or password.");
-        }
+			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 (!mask.empty())
+				{
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
+					user->ChangeDisplayedHost(mask.c_str());
+					delete Conf;
+					return CMD_LOCALONLY;
+				}
+			}
+		}
+
+		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		delete Conf;
+		return CMD_FAILURE;
+	}
 };
 
 class ModuleVHost : public Module
 {
  private:
 
-	cmd_vhost* mycommand;
+	CommandVhost* mycommand;
 	 
  public:
-	ModuleVHost(Server* Me)
-		: Module::Module(Me)
+	ModuleVHost(InspIRCd* Me) : Module(Me)
 	{
-		Srv = Me;
-                Conf = new ConfigReader;
-                mycommand = new cmd_vhost();
-                Srv->AddCommand(mycommand);
+		mycommand = new CommandVhost(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleVHost()
 	{
-		delete Conf;
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = 1;
-	}
 
-	virtual void OnRehash(std::string parameter)
-	{
-		delete Conf;
-		Conf = new ConfigReader;
-	}
-	
 	virtual Version GetVersion()
 	{
-		// returns the version number of the module to be
-		// listed in /MODULES
-		return Version(1,0,0,1,VF_VENDOR);
-	}
-	
-};
-
-// 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(Server* Me)
-	{
-		return new ModuleVHost(Me);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleVHostFactory;
-}
+MODULE_INIT(ModuleVHost)