X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=f0ebfe54b5372e0977056e818a20543f775804c4;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=6809f9a3aa85c962eca2d5a8555db1ae821240c4;hpb=90dcc24c2a780cd381617d39f6c3454925d9ec70;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 6809f9a3a..f0ebfe54b 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -20,39 +20,41 @@ 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 */
 
-ConfigReader *Conf;
-Server* Srv;
+static ConfigReader *Conf;
+
 
 class cmd_vhost : public command_t
 {
  public:
-        cmd_vhost() : command_t("VHOST", 0, 2)
-        {
-                this->source = "m_vhost.so";
-        }
-
-        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);
+ cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2)
+	{
+		this->source = "m_vhost.so";
+		syntax = "<username> <password>";
+	}
+
+	void Handle (const char** parameters, int pcnt, userrec *user)
+	{
+		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.");
-        }
+			if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
+			{
+				if (mask != "")
+				{
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
+					user->ChangeDisplayedHost(mask.c_str());
+					return;
+				}
+			}
+		}
+		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+	}
 };
 
 class ModuleVHost : public Module
@@ -62,18 +64,17 @@ 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()
 	{
-		delete Conf;
+		DELETE(Conf);
 	}
 
 	void Implements(char* List)
@@ -81,10 +82,10 @@ class ModuleVHost : public Module
 		List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(std::string parameter)
+	virtual void OnRehash(const std::string &parameter)
 	{
-		delete Conf;
-		Conf = new ConfigReader;
+		DELETE(Conf);
+		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual Version GetVersion()
@@ -109,7 +110,7 @@ class ModuleVHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleVHost(Me);
 	}