Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 61d07a7e2ac88fe926ec42d553635cc7fd8c050f..31c504af8df7084a4ec713af73d631991eeb6dbd 100644 (file)
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -1,124 +1,92 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides masking of user hostnames via traditional /VHOST command */
 
-static ConfigReader *Conf;
-static Server* Srv;
-
-class cmd_vhost : public command_t
+/** Handle /VHOST
+ */
+class CommandVhost : public Command
 {
  public:
-       cmd_vhost() : command_t("VHOST", 0, 2)
+       CommandVhost(Module* Creator) : Command(Creator,"VHOST", 2)
        {
-               this->source = "m_vhost.so";
+               syntax = "<username> <password>";
        }
 
-       void 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);
-                       if ((!strcmp(parameters[0],username.c_str())) && (!strcmp(parameters[1],pass.c_str())))
+                       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 (parameters[0] == username && !ServerInstance->PassCompare(user, pass, parameters[1], hash))
                        {
-                               if (mask != "")
+                               if (!mask.empty())
                                {
-                                       Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
-                                       Srv->ChangeHost(user,mask);
-                                       return;
+                                       user->WriteServ("NOTICE "+user->nick+" :Setting your VHost: " + mask);
+                                       user->ChangeDisplayedHost(mask.c_str());
+                                       return CMD_SUCCESS;
                                }
                        }
                }
-               Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid username or password.");
+
+               user->WriteServ("NOTICE "+user->nick+" :Invalid username or password.");
+               return CMD_FAILURE;
        }
 };
 
 class ModuleVHost : public Module
 {
  private:
+       CommandVhost cmd;
 
-       cmd_vhost* mycommand;
-        
  public:
-       ModuleVHost(Server* Me) : Module::Module(Me)
+       ModuleVHost() : cmd(this)
        {
-               Srv = Me;
-               Conf = new ConfigReader;
-               mycommand = new cmd_vhost();
-               Srv->AddCommand(mycommand);
-       }
-       
-       virtual ~ModuleVHost()
-       {
-               DELETE(Conf);
        }
 
-       void Implements(char* List)
+       void init()
        {
-               List[I_OnRehash] = 1;
+               ServerInstance->Modules->AddService(cmd);
        }
 
-       virtual void OnRehash(const std::string &parameter)
-       {
-               DELETE(Conf);
-               Conf = new ConfigReader;
-       }
-       
-       virtual Version GetVersion()
+       virtual ~ModuleVHost()
        {
-               // returns the version number of the module to be
-               // listed in /MODULES
-               return Version(1,0,0,1,VF_VENDOR);
        }
-       
-};
 
-// 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(Server* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleVHost(Me);
+               return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
        }
-       
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-       return new ModuleVHostFactory;
-}
+MODULE_INIT(ModuleVHost)