Add VF_COMMON to a lot modules which require it. Reported by danielg in bug #369...

[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 0a08c7194a8584f4ce95829d10a45aceb2a74646..3ce910456bdde89c1acdb251094bf7a425531bcd 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -11,11 +11,10 @@
  * ---------------------------------------------------
  */
 
-#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 */
 
@@ -39,16 +38,18 @@ class cmd_vhost : public command_t
                        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;
+                                       return CMD_LOCALONLY;
                                }
                        }
                }
+
                user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
                return CMD_FAILURE;
        }
@@ -61,7 +62,7 @@ class ModuleVHost : public Module
        cmd_vhost* mycommand;
         
  public:
-       ModuleVHost(InspIRCd* Me) : Module::Module(Me)
+       ModuleVHost(InspIRCd* Me) : Module(Me)
        {
                
                Conf = new ConfigReader(ServerInstance);
@@ -92,29 +93,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)