Run configure -update on all svn/git changes

[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 8607745747c0a0028443f9b1fe96d1d5a631d0c4..e99adcaece54ce9d53583abeebb986224860fb4e 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -79,9 +79,9 @@ class SVSHoldFactory : public XLineFactory
 class CommandSvshold : public Command
 {
  public:
-       CommandSvshold(InspIRCd* Me, Module* Creator) : Command(Me, Creator, "SVSHOLD", "o", 1)
+       CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1)
        {
-               this->syntax = "<nickname> [<duration> :<reason>]";
+               flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
                TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
        }
 
@@ -100,7 +100,7 @@ class CommandSvshold : public Command
                {
                        if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed SVSHOLD on %s.",user->nick.c_str(),parameters[0].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
                        }
                        else
                        {
@@ -128,6 +128,16 @@ class CommandSvshold : public Command
                        {
                                if (ServerInstance->XLines->AddLine(r, user))
                                {
+                                       if (!duration)
+                                       {
+                                               ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+                                       }
+                                       else
+                                       {
+                                               time_t c_requires_crap = duration + ServerInstance->Time();
+                                               ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+                                       }
+
                                        ServerInstance->XLines->ApplyLines();
                                }
                                else
@@ -139,6 +149,11 @@ class CommandSvshold : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleSVSHold : public Module
@@ -148,7 +163,7 @@ class ModuleSVSHold : public Module
 
 
  public:
-       ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(Me, this), s(Me)
+       ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(this), s(Me)
        {
                ServerInstance->XLines->RegisterFactory(&s);
                ServerInstance->AddCommand(&cmd);
@@ -187,7 +202,7 @@ class ModuleSVSHold : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };