Merge pull request #514 from SaberUK/master+virtual-cleanup

[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 907649158aa810dae9b18fb387789477d1d00567..e3e02fbe80f2d40de20d102ea1c169d99b63ba1b 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -27,11 +27,12 @@
  */
 class CommandSethost : public Command
 {
- private:
        char* hostmap;
+
  public:
        CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o'; syntax = "<new-hostname>";
                TRANSLATE2(TR_TEXT, TR_END);
        }
@@ -43,18 +44,14 @@ class CommandSethost : public Command
                {
                        if (!hostmap[(const unsigned char)*x])
                        {
-                               user->WriteServ("NOTICE "+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)
                {
-                       user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick.c_str());
+                       user->WriteNotice("*** SETHOST: Host too long");
                        return CMD_FAILURE;
                }
 
@@ -73,18 +70,22 @@ class ModuleSetHost : public Module
 {
        CommandSethost cmd;
        char hostmap[256];
+
  public:
        ModuleSetHost()
                : cmd(this, hostmap)
+       {
+       }
+
+       void init() CXX11_OVERRIDE
        {
                OnRehash(NULL);
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
 
@@ -93,15 +94,10 @@ class ModuleSetHost : public Module
                        hostmap[(unsigned char)*n] = 1;
        }
 
-       virtual ~ModuleSetHost()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the SETHOST command", VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleSetHost)