Annotations

[user/henk/code/inspircd.git] / src / modules / m_vhost.cpp

diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 270d7aa0bf16518282ce7991fecc100085bff8f4..eb6c3e38e151c276d0fc74aac63b52d40e810370 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -25,17 +25,18 @@ using namespace std;
 /* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
 
 static ConfigReader *Conf;
-static Server* Srv;
+
 
 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 (char **parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                for (int index = 0; index < Conf->Enumerate("vhost"); index++)
                {
@@ -46,13 +47,14 @@ class cmd_vhost : public command_t
                        {
                                if (mask != "")
                                {
-                                       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_FAILURE;
                                }
                        }
                }
-               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;
        }
 };
 
@@ -63,12 +65,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()
@@ -84,7 +86,7 @@ class ModuleVHost : public Module
        virtual void OnRehash(const std::string &parameter)
        {
                DELETE(Conf);
-               Conf = new ConfigReader;
+               Conf = new ConfigReader(ServerInstance);
        }
        
        virtual Version GetVersion()
@@ -109,7 +111,7 @@ class ModuleVHostFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleVHost(Me);
        }