Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_sethost.cpp

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 1cacef956edb8f785c2ed386c427dccffb43e83a..75dbe1c6a6c00f84a4ce09661b720c4327d60210 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -1,55 +1,60 @@
-/*       +------------------------------------+
- *       | 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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 support for the SETHOST command */
+#include "inspircd.h"
 
 /** Handle /SETHOST
  */
-class cmd_sethost : public command_t
+class CommandSethost : public Command
 {
- private:
        char* hostmap;
+
  public:
-       cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+       CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
        {
-               this->source = "m_sethost.so";
-               syntax = "<new-hostname>";
+               allow_empty_last_param = false;
+               flags_needed = 'o'; syntax = "<new-hostname>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                size_t len = 0;
-               for (const char* x = parameters[0]; *x; x++, len++)
+               for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++, len++)
                {
-                       if (!hostmap[(unsigned char)*x])
+                       if (!hostmap[(const unsigned char)*x])
                        {
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+                               user->WriteNotice("*** SETHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
                        }
                }
-               if (len > 64)
+
+               if (len > ServerInstance->Config->Limits.MaxHost)
                {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
+                       user->WriteNotice("*** SETHOST: Host too long");
                        return CMD_FAILURE;
                }
+
                if (user->ChangeDisplayedHost(parameters[0]))
                {
-                       ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->dhost);
                        return CMD_SUCCESS;
                }
 
@@ -60,67 +65,28 @@ class cmd_sethost : public command_t
 
 class ModuleSetHost : public Module
 {
-       cmd_sethost* mycommand;
+       CommandSethost cmd;
        char hostmap[256];
- public:
-       ModuleSetHost(InspIRCd* Me)
-               : Module(Me)
-       {       
-               OnRehash(NULL,"");
-               mycommand = new cmd_sethost(ServerInstance, hostmap);
-               ServerInstance->AddCommand(mycommand);
-       }
 
-       void Implements(char* List)
+ public:
+       ModuleSetHost()
+               : cmd(this, hostmap)
        {
-               List[I_OnRehash] = 1;
        }
 
-       void OnRehash(userrec* user, const std::string &parameter)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               ConfigReader Conf(ServerInstance);
-               std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
-
-               if (hmap.empty())
-                       hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+               std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
 
-               memset(&hostmap, 0, 255);
+               memset(hostmap, 0, sizeof(hostmap));
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
                        hostmap[(unsigned char)*n] = 1;
        }
 
-       virtual ~ModuleSetHost()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Provides support for the SETHOST command", VF_VENDOR);
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-       }
-       
 };
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-       ModuleSetHostFactory()
-       {
-       }
-       
-       ~ModuleSetHostFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSetHost(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)