X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_vhost.cpp;h=3ce910456bdde89c1acdb251094bf7a425531bcd;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=a7ce8fd4ab07a040dda9c183dbb644f517cb78a2;hpb=dc8f5d02f77aeabefaefe88005b99c8b47030ab7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index a7ce8fd4a..3ce910456 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,58 +2,56 @@
  *       | 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-2007 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 "inspircd.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;
+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++)
 		{
 			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 != "")
+				if (!mask.empty())
 				{
-					Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
-					Srv->ChangeHost(user,mask);
-					return;
+					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
+					user->ChangeDisplayedHost(mask.c_str());
+					return CMD_LOCALONLY;
 				}
 			}
 		}
-		Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+
+		user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+		return CMD_FAILURE;
 	}
 };
 
@@ -64,12 +62,12 @@ class ModuleVHost : public Module
 	cmd_vhost* 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);
+		
+		Conf = new ConfigReader(ServerInstance);
+		mycommand = new cmd_vhost(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleVHost()
@@ -82,44 +80,18 @@ class ModuleVHost : public Module
 		List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, 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);
 	}
 	
 };
 
-// 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);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleVHostFactory;
-}
+MODULE_INIT(ModuleVHost)