Send HALFOP= line in CAPAB CAPABILITIES for 1201 compat (anope relies on this)

[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 f1a074aec8aeb79f569c65c916658ba8547e3d57..704e769b3311f66fe06145c5bbc1a100959eb4e1 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,29 +27,27 @@ class CommandVhost : public Command
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               ConfigReader *Conf = new ConfigReader;
-
-               for (int index = 0; index < Conf->Enumerate("vhost"); index++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("vhost");
+               for(ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       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);
+                       ConfigTag* tag = i->second;
+                       std::string mask = tag->getString("host");
+                       std::string username = tag->getString("user");
+                       std::string pass = tag->getString("pass");
+                       std::string hash = tag->getString("hash");
 
-                       if ((!strcmp(parameters[0].c_str(),username.c_str())) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()))
+                       if (parameters[0] == username && !ServerInstance->PassCompare(user, pass, parameters[1], hash))
                        {
                                if (!mask.empty())
                                {
-                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
+                                       user->WriteServ("NOTICE "+user->nick+" :Setting your VHost: " + mask);
                                        user->ChangeDisplayedHost(mask.c_str());
-                                       delete Conf;
                                        return CMD_SUCCESS;
                                }
                        }
                }
 
                user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
-               delete Conf;
                return CMD_FAILURE;
        }
 };
@@ -72,7 +70,7 @@ class ModuleVHost : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR,API_VERSION);
+               return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
        }
 
 };