Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index c64bec6541d874aab30a52acdfcf8a018709703b..a64576de5c57c3ffc71f94b42ff76b8810f4ea7e 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.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, 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -25,12 +32,13 @@
 CmdResult CommandDelLine::Handle(User* user, Params& params)
 {
        const std::string& setter = user->nick;
+       std::string reason;
 
        // XLineManager::DelLine() returns true if the xline existed, false if it didn't
-       if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
+       if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], reason, user))
        {
-               ServerInstance->SNO->WriteToSnoMask('X',"%s removed %s%s on %s", setter.c_str(),
-                               params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str());
+               ServerInstance->SNO->WriteToSnoMask('X', "%s removed %s%s on %s: %s", setter.c_str(),
+                               params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str(), reason.c_str());
                return CMD_SUCCESS;
        }
        return CMD_FAILURE;