Remove debug stuff

[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 4654507f6aeaf8b2a6e866097863c663a40369d5..08d3e6b664249ea4497460a3a2e89fcded3fdd67 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -15,21 +15,21 @@
 
 /* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
 
-static ConfigReader* Conf;
-
 /** Handle /VHOST
  */
-class cmd_vhost : public command_t
+class CommandVhost : public Command
 {
  public:
-       cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2)
+       CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
        {
                this->source = "m_vhost.so";
                syntax = "<username> <password>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
+               ConfigReader *Conf = new ConfigReader(ServerInstance);
+
                for (int index = 0; index < Conf->Enumerate("vhost"); index++)
                {
                        std::string mask = Conf->ReadValue("vhost","host",index);
@@ -42,12 +42,14 @@ class cmd_vhost : public command_t
                                {
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
                                        user->ChangeDisplayedHost(mask.c_str());
+                                       delete Conf;
                                        return CMD_LOCALONLY;
                                }
                        }
                }
 
                user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+               delete Conf;
                return CMD_FAILURE;
        }
 };
@@ -56,33 +58,23 @@ class ModuleVHost : public Module
 {
  private:
 
-       cmd_vhost* mycommand;
+       CommandVhost* mycommand;
         
  public:
        ModuleVHost(InspIRCd* Me) : Module(Me)
        {
-               
-               Conf = new ConfigReader(ServerInstance);
-               mycommand = new cmd_vhost(ServerInstance);
+               mycommand = new CommandVhost(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleVHost()
        {
-               DELETE(Conf);
        }
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
-       {
-               DELETE(Conf);
-               Conf = new ConfigReader(ServerInstance);
-       }
-       
        virtual Version GetVersion()
        {
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);