X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Frsquit.cpp;h=53cc92f414f3d76a1b2f334c9919f2c04e3dd5fe;hb=4a6fedd9324d87349a806c9c1d0ae6e7d3c1fd38;hp=988918c3fb1b1a09af68424f41bad566f78e0d9f;hpb=2f753f7864bf847af26f7a1aedc727927c163738;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 988918c3f..53cc92f41 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -1,6 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
@@ -29,40 +35,38 @@ CommandRSQuit::CommandRSQuit(Module* Creator)
 	: Command(Creator, "RSQUIT", 1)
 {
 	flags_needed = 'o';
-	syntax = "<target-server-mask> [reason]";
+	syntax = "<target-server-mask> [:<reason>]";
 }
 
-CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandRSQuit::Handle(User* user, const Params& parameters)
 {
 	TreeServer *server_target; // Server to squit
 
 	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;
 }
 
-RouteDescriptor CommandRSQuit::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandRSQuit::GetRouting(User* user, const Params& parameters)
 {
 	return ROUTE_UNICAST(parameters[0]);
 }