Remove some uline checks that ran after an IS_LOCAL() check

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

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 377179bf058323de4ead88b36dd2e6aa236c6213..d2269839d94bf95d74cade0a14a750e6c396395e 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -123,6 +123,9 @@ class CommandSvshold : public Command
                }
                else
                {
+                       if (parameters.size() < 3)
+                               return CMD_FAILURE;
+
                        // Adding - XXX todo make this respect <insane> tag perhaps..
                        long duration = ServerInstance->Duration(parameters[1]);
                        SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
@@ -170,9 +173,9 @@ class ModuleSVSHold : public Module
        void init()
        {
                ServerInstance->XLines->RegisterFactory(&s);
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ModResult OnStats(char symbol, User* user, string_list &out)