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

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

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 2e81c1efd063138c7fcee3f7df07304b83976bf4..2ad886fcda9e9e6b322f1c7a585ed407bee49179 100644 (file)
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -31,27 +31,22 @@ class CommandSetident : public Command
  public:
  CommandSetident(Module* Creator) : Command(Creator,"SETIDENT", 1)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o'; syntax = "<new-ident>";
                TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle(const std::vector<std::string>& parameters, User *user)
        {
-               if (parameters.size() == 0)
-               {
-                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick.c_str());
-                       return CMD_FAILURE;
-               }
-
                if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax)
                {
-                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick.c_str());
+                       user->WriteNotice("*** SETIDENT: Ident is too long");
                        return CMD_FAILURE;
                }
 
                if (!ServerInstance->IsIdent(parameters[0].c_str()))
                {
-                       user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick.c_str());
+                       user->WriteNotice("*** SETIDENT: Invalid characters in ident");
                        return CMD_FAILURE;
                }
 
@@ -62,7 +57,6 @@ class CommandSetident : public Command
        }
 };
 
-
 class ModuleSetIdent : public Module
 {
        CommandSetident cmd;
@@ -70,19 +64,17 @@ class ModuleSetIdent : public Module
  public:
        ModuleSetIdent() : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
        }
 
-       virtual ~ModuleSetIdent()
+       void init() CXX11_OVERRIDE
        {
+               ServerInstance->Modules->AddService(cmd);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the SETIDENT command", VF_VENDOR);
        }
-
 };
 
-
 MODULE_INIT(ModuleSetIdent)