Add a shun option to only apply when users are fully connected.

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

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 5124339fbe9dc5a2d69b28be31ca08c4c992af62..f0a604858fe9c86ac48452f4cd54611da510fc84 100644 (file)
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -1,6 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -31,7 +38,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 
        if (!xlf)
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('x', "%s sent me an unknown ADDLINE type (%s).", setter.c_str(), params[0].c_str());
                return CMD_FAILURE;
        }
 
@@ -42,7 +49,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
        }
        catch (ModuleException &e)
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
+               ServerInstance->SNO->WriteToSnoMask('x', "Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
                return CMD_FAILURE;
        }
        xl->SetCreateTime(ConvToNum<time_t>(params[3]));
@@ -50,14 +57,16 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
        {
                if (xl->duration)
                {
-                       std::string timestr = InspIRCd::TimeString(xl->expiry);
-                       ServerInstance->SNO->WriteToSnoMask('X',"%s added %s%s on %s to expire on %s: %s",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "-line" : "",
-                                       params[1].c_str(), timestr.c_str(), params[5].c_str());
+                       ServerInstance->SNO->WriteToSnoMask('X', "%s added timed %s%s for %s, expires in %s (on %s): %s",
+                               setter.c_str(), params[0].c_str(), params[0].length() == 1 ? "-line" : "",
+                               params[1].c_str(), InspIRCd::DurationString(xl->duration).c_str(),
+                               InspIRCd::TimeString(xl->expiry).c_str(), params[5].c_str());
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('X',"%s added permanent %s%s on %s: %s",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "-line" : "",
-                                       params[1].c_str(),params[5].c_str());
+                       ServerInstance->SNO->WriteToSnoMask('X', "%s added permanent %s%s on %s: %s",
+                               setter.c_str(), params[0].c_str(), params[0].length() == 1 ? "-line" : "",
+                               params[1].c_str(), params[5].c_str());
                }
 
                TreeServer* remoteserver = TreeServer::Get(usr);