dz is determined to crash your ircd :P

[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 2a0280d2e7417145cd2befc2639be2920bdfe286..71f1069a3eb4557ed6566bca18acee74f48ae8ac 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -11,16 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.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;
-
 /** Handle /VHOST
  */
 class cmd_vhost : public command_t
@@ -34,22 +28,28 @@ class cmd_vhost : public command_t
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
+               ConfigReader *Conf = new ConfigReader(ServerInstance);
+
                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())
                                {
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
                                        user->ChangeDisplayedHost(mask.c_str());
-                                       return CMD_FAILURE;
+                                       delete Conf;
+                                       return CMD_LOCALONLY;
                                }
                        }
                }
+
                user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+               delete Conf;
                return CMD_FAILURE;
        }
 };
@@ -61,30 +61,20 @@ class ModuleVHost : public Module
        cmd_vhost* mycommand;
         
  public:
-       ModuleVHost(InspIRCd* Me) : Module::Module(Me)
+       ModuleVHost(InspIRCd* Me) : Module(Me)
        {
-               
-               Conf = new ConfigReader(ServerInstance);
                mycommand = new cmd_vhost(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleVHost()
        {
-               DELETE(Conf);
        }
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(const std::string &parameter)
-       {
-               DELETE(Conf);
-               Conf = new ConfigReader(ServerInstance);
-       }
-       
        virtual Version GetVersion()
        {
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);
@@ -92,29 +82,5 @@ class ModuleVHost : public Module
        
 };
 
-// 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(InspIRCd* Me)
-       {
-               return new ModuleVHost(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleVHostFactory;
-}
+MODULE_INIT(ModuleVHost)