ssl_gnutls: remove PackageInfo directives for EOL Debian versions.

[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 dbf621932f07560546c1c47376cf8985b7a78760..df487199a48143c9bb4f38f028d28788e1de6475 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -121,7 +121,7 @@ class CommandSvshold : public Command
                        }
                        else
                        {
-                               user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found in list, try /stats S.");
+                               user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found on the list.");
                        }
                }
                else
@@ -148,9 +148,9 @@ class CommandSvshold : public Command
                                }
                                else
                                {
-                                       time_t c_requires_crap = duration + ServerInstance->Time();
-                                       std::string timestr = InspIRCd::TimeString(c_requires_crap);
-                                       ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), parameters[2].c_str());
+                                       ServerInstance->SNO->WriteGlobalSno('x', "%s added timed SVSHOLD for %s, expires in %s (on %s): %s",
+                                               user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(),
+                                               InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
                                }
                        }
                        else
@@ -223,7 +223,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implements SVSHOLD. Like Q-lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
+               return Version("Implements SVSHOLD, like Q-lines, but can only be added/removed by Services", VF_COMMON | VF_VENDOR);
        }
 };