Merge pull request #1050 from Aviator45003/insp20

[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 d2269839d94bf95d74cade0a14a750e6c396395e..e666b0fe24b977c1de8f5845e03c9152e01e12cc 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -25,6 +25,11 @@
 
 /* $ModDesc: Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services. */
 
+namespace
+{
+       bool silent;
+}
+
 /** Holds a SVSHold item
  */
 class SVSHold : public XLine
@@ -32,7 +37,7 @@ class SVSHold : public XLine
 public:
        irc::string nickname;
 
-       SVSHold(time_t s_time, long d, std::string src, std::string re, std::string nick)
+       SVSHold(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& nick)
                : XLine(s_time, d, src, re, "SVSHOLD")
        {
                this->nickname = nick.c_str();
@@ -58,8 +63,11 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
-                       this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
+               if (!silent)
+               {
+                       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
+                               this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
+               }
        }
 
        const char* Displayable()
@@ -114,7 +122,8 @@ 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());
+                               if (!silent)
+                                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
                        }
                        else
                        {
@@ -132,6 +141,9 @@ class CommandSvshold : public Command
 
                        if (ServerInstance->XLines->AddLine(r, user))
                        {
+                               if (silent)
+                                       return CMD_SUCCESS;
+
                                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());
@@ -174,8 +186,15 @@ class ModuleSVSHold : public Module
        {
                ServerInstance->XLines->RegisterFactory(&s);
                ServerInstance->Modules->AddService(cmd);
-               Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
+               Implementation eventlist[] = { I_OnUserPreNick, I_OnStats, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               OnRehash(NULL);
+       }
+
+       void OnRehash(User* user)
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("svshold");
+               silent = tag->getBool("silent");
        }
 
        virtual ModResult OnStats(char symbol, User* user, string_list &out)