fixed some indentation and spacing in modules

[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 c77a3f85f56068937945ddd9adefbc43ac1feee5..406891740af2fc8e4a527dbcfa25b19b12c53849 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
@@ -12,43 +12,45 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $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 std::vector<std::string> &parameters, User *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())))
+                       std::string hash = Conf->ReadValue("vhost","hash",index);
+
+                       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())
                                {
                                        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;
        }
 };
@@ -57,38 +59,26 @@ 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);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleVHost)