Merge tag 'v2.0.25' into master.

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

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 988918c3fb1b1a09af68424f41bad566f78e0d9f..487db28261186d17cf958f795765202d3bd97fc8 100644 (file)
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -39,24 +39,22 @@ CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, Use
        server_target = Utils->FindServerMask(parameters[0]);
        if (!server_target)
        {
-               ((ModuleSpanningTree*)(Module*)creator)->RemoteMessage(user, "*** RSQUIT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str());
+               user->WriteRemoteNotice(InspIRCd::Format("*** RSQUIT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str()));
                return CMD_FAILURE;
        }
 
        if (server_target->IsRoot())
        {
-               ((ModuleSpanningTree*)(Module*)creator)->RemoteMessage(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)", parameters[0].c_str());
+               user->WriteRemoteNotice(InspIRCd::Format("*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)", parameters[0].c_str()));
                return CMD_FAILURE;
        }
 
        if (server_target->IsLocal())
        {
                // We have been asked to remove server_target.
-               TreeSocket* sock = server_target->GetSocket();
                const char* reason = parameters.size() == 2 ? parameters[1].c_str() : "No reason";
                ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason);
-               sock->Squit(server_target, "Server quit by " + user->GetFullRealHost() + " (" + reason + ")");
-               sock->Close();
+               server_target->SQuit("Server quit by " + user->GetFullRealHost() + " (" + reason + ")");
        }
 
        return CMD_SUCCESS;