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 552d4f034d7f2bf2de49c026b3588d970f1a67e6..75dbe1c6a6c00f84a4ce09661b720c4327d60210 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -1,32 +1,37 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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"
 
-/* $ModDesc: Provides support for the SETHOST command */
+#include "inspircd.h"
 
 /** Handle /SETHOST
  */
 class CommandSethost : public Command
 {
- private:
        char* hostmap;
+
  public:
-       CommandSethost (InspIRCd* Instance, char* hmap) : Command(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>";
-               TRANSLATE2(TR_TEXT, TR_END);
+               allow_empty_last_param = false;
+               flags_needed = 'o'; syntax = "<new-hostname>";
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -36,25 +41,21 @@ class CommandSethost : public Command
                {
                        if (!hostmap[(const unsigned char)*x])
                        {
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
+                               user->WriteNotice("*** SETHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
                        }
                }
-               if (len == 0)
-               {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick.c_str());
-                       return CMD_FAILURE;
-               }
-               if (len > 64)
+
+               if (len > ServerInstance->Config->Limits.MaxHost)
                {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick.c_str());
+                       user->WriteNotice("*** SETHOST: Host too long");
                        return CMD_FAILURE;
                }
 
-               if (user->ChangeDisplayedHost(parameters[0].c_str()))
+               if (user->ChangeDisplayedHost(parameters[0]))
                {
-                       ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
-                       return CMD_LOCALONLY;
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->dhost);
+                       return CMD_SUCCESS;
                }
 
                return CMD_FAILURE;
@@ -64,42 +65,28 @@ class CommandSethost : public Command
 
 class ModuleSetHost : public Module
 {
-       CommandSethost* mycommand;
+       CommandSethost cmd;
        char hostmap[256];
+
  public:
-       ModuleSetHost(InspIRCd* Me)
-               : Module(Me)
+       ModuleSetHost()
+               : cmd(this, hostmap)
        {
-               OnRehash(NULL,"");
-               mycommand = new CommandSethost(ServerInstance, hostmap);
-               ServerInstance->AddCommand(mycommand);
-               Implementation eventlist[] = { I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-
-       void OnRehash(User* 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, 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("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
-       }
-
 };
 
 MODULE_INIT(ModuleSetHost)