X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=f6f729058262ceafb93d1294b290a92e1ef326b5;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=80d3f8f6b16fdada9655ed4c88f3863bae1e33cd;hpb=6d4128715da39b1e097642a64ee0bd40586d9a38;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 80d3f8f6b..f6f729058 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -24,19 +24,20 @@ using namespace std;
 
 /* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
 
-static ConfigReader *Conf;
-static Server* Srv;
+static ConfigReader* Conf;
 
+/** Handle /VHOST
+ */
 class cmd_vhost : public command_t
 {
  public:
-	cmd_vhost() : command_t("VHOST", 0, 2)
+	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)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		for (int index = 0; index < Conf->Enumerate("vhost"); index++)
 		{
@@ -49,11 +50,12 @@ class cmd_vhost : public command_t
 				{
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
 					user->ChangeDisplayedHost(mask.c_str());
-					return;
+					return CMD_FAILURE;
 				}
 			}
 		}
 		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		return CMD_FAILURE;
 	}
 };
 
@@ -64,12 +66,12 @@ 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()
@@ -85,14 +87,12 @@ class ModuleVHost : public Module
 	virtual void OnRehash(const std::string &parameter)
 	{
 		DELETE(Conf);
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual Version GetVersion()
 	{
-		// returns the version number of the module to be
-		// listed in /MODULES
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -110,7 +110,7 @@ class ModuleVHostFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleVHost(Me);
 	}