Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[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 a7ce8fd4ab07a040dda9c183dbb644f517cb78a2..f0ebfe54b5372e0977056e818a20543f775804c4 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -25,12 +25,12 @@ 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>";
@@ -47,13 +47,13 @@ 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);
+                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
+                                       user->ChangeDisplayedHost(mask.c_str());
                                        return;
                                }
                        }
                }
-               Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+               user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
        }
 };
 
@@ -64,12 +64,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,7 +85,7 @@ class ModuleVHost : public Module
        virtual void OnRehash(const std::string &parameter)
        {
                DELETE(Conf);
-               Conf = new ConfigReader;
+               Conf = new ConfigReader(ServerInstance);
        }
        
        virtual Version GetVersion()
@@ -110,7 +110,7 @@ class ModuleVHostFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleVHost(Me);
        }