Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

[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 3ce910456bdde89c1acdb251094bf7a425531bcd..31c504af8df7084a4ec713af73d631991eeb6dbd 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -1,56 +1,62 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #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(Module* Creator) : Command(Creator,"VHOST", 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)
        {
-               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);
+                       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],username.c_str())) && (!strcmp(parameters[1],pass.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());
-                                       return CMD_LOCALONLY;
+                                       return CMD_SUCCESS;
                                }
                        }
                }
 
-               user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+               user->WriteServ("NOTICE "+user->nick+" :Invalid username or password.");
                return CMD_FAILURE;
        }
 };
@@ -58,39 +64,28 @@ class cmd_vhost : public command_t
 class ModuleVHost : public Module
 {
  private:
+       CommandVhost cmd;
 
-       cmd_vhost* mycommand;
-        
  public:
-       ModuleVHost(InspIRCd* Me) : Module(Me)
-       {
-               
-               Conf = new ConfigReader(ServerInstance);
-               mycommand = new cmd_vhost(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-       }
-       
-       virtual ~ModuleVHost()
+       ModuleVHost() : cmd(this)
        {
-               DELETE(Conf);
        }
 
-       void Implements(char* List)
+       void init()
        {
-               List[I_OnRehash] = 1;
+               ServerInstance->Modules->AddService(cmd);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual ~ModuleVHost()
        {
-               DELETE(Conf);
-               Conf = new ConfigReader(ServerInstance);
        }
-       
+
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
        }
-       
+
 };
 
 MODULE_INIT(ModuleVHost)