X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Frsquit.cpp;h=a5dd317528993251ea6b7d3bec83cc9f93c12523;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=0b3844f065aa102e6ab0344a352a7c023c9b7c6b;hpb=395a610c2cf3d3712962e2048cde7244ed16e765;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 0b3844f06..a5dd31752 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,28 +15,24 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rsquit.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+#include "rsquit.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
 
-cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", "o", 1), Creator(Callback), Utils(Util)
+CommandRSQuit::CommandRSQuit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", "o", 1), Creator(Callback), Utils(Util)
 {
 	this->source = "m_spanningtree.so";
 	syntax = "<target-server-mask> [reason]";
 }
 
-CmdResult cmd_rsquit::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	TreeServer *server_target; // Server to squit
 	TreeServer *server_linked; // Server target is linked to
@@ -44,13 +40,13 @@ CmdResult cmd_rsquit::Handle (const char* const* parameters, int pcnt, User *use
 	server_target = Utils->FindServerMask(parameters[0]);
 	if (!server_target)
 	{
-		user->WriteServ("NOTICE %s :*** RSQUIT: Server \002%s\002 isn't connected to the network!", user->nick, parameters[0]);
+		user->WriteServ("NOTICE %s :*** RSQUIT: Server \002%s\002 isn't connected to the network!", user->nick.c_str(), parameters[0].c_str());
 		return CMD_FAILURE;
 	}
 
 	if (server_target == Utils->TreeRoot)
 	{
-		NoticeUser(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! ("+ConvToStr(parameters[0])+" matches local server name)");
+		NoticeUser(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! ("+parameters[0]+" matches local server name)");
 		return CMD_FAILURE;
 	}
 
@@ -62,8 +58,8 @@ CmdResult cmd_rsquit::Handle (const char* const* parameters, int pcnt, User *use
 		TreeSocket* sock = server_target->GetSocket();
 		if (sock)
 		{
-			const char *reason = pcnt == 2 ? parameters[1] : "No reason";
-			ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0], user->nick, reason);
+			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, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")");
 			ServerInstance->SE->DelFd(sock);
 			sock->Close();
@@ -75,15 +71,15 @@ CmdResult cmd_rsquit::Handle (const char* const* parameters, int pcnt, User *use
 }
 
 // XXX use protocol interface instead of rolling our own :)
-void cmd_rsquit::NoticeUser(User* user, const std::string &msg)
+void CommandRSQuit::NoticeUser(User* user, const std::string &msg)
 {
 	if (IS_LOCAL(user))
 	{
-		user->WriteServ("NOTICE %s :%s",user->nick,msg.c_str());
+		user->WriteServ("NOTICE %s :%s",user->nick.c_str(),msg.c_str());
 	}
 	else
 	{
-		std::deque<std::string> params;
+		parameterlist params;
 		params.push_back(user->nick);
 		params.push_back("NOTICE "+ConvToStr(user->nick)+" :"+msg);
 		Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", params, user->server);