Add support for blacklists and whitelists, just http password auth to go (the most...

[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 71f1069a3eb4557ed6566bca18acee74f48ae8ac..ecc67b19e29d9c4f3537a07b8e10477616a0c988 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,16 +17,16 @@
 
 /** 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 std::vector<std::string> &parameters, User *user)
        {
                ConfigReader *Conf = new ConfigReader(ServerInstance);
 
@@ -35,8 +35,9 @@ 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);
+                       std::string hash = Conf->ReadValue("vhost","hash",index);
 
-                       if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
+                       if ((!strcmp(parameters[0].c_str(),username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()))
                        {
                                if (!mask.empty())
                                {
@@ -58,26 +59,24 @@ class ModuleVHost : public Module
 {
  private:
 
-       cmd_vhost* mycommand;
+       CommandVhost* mycommand;
         
  public:
        ModuleVHost(InspIRCd* Me) : Module(Me)
        {
-               mycommand = new cmd_vhost(ServerInstance);
+               mycommand = new CommandVhost(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleVHost()
        {
        }
 
-       void Implements(char* List)
-       {
-       }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
        
 };