From 315c7e7484834567954234146a84f6354e31ad0e Mon Sep 17 00:00:00 2001 From: w00t Date: Wed, 6 Jun 2007 14:43:25 +0000 Subject: Patch fixing (almost) remote kill server notices, by just passing KILL onto cmd_kill and not attempting to duplicate code for it in spanningtree. Dev: Two small issues are left with this, see comments in cmd_kill.cpp. Thanks, HiroP. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7248 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/treesocket2.cpp | 34 ------------------------------ 1 file changed, 34 deletions(-) (limited to 'src/modules/m_spanningtree/treesocket2.cpp') diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index dcf4652c7..e715fdffc 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -376,36 +376,6 @@ bool TreeSocket::RemoteRehash(const std::string &prefix, std::deque return true; } -bool TreeSocket::RemoteKill(const std::string &prefix, std::deque ¶ms) -{ - if (params.size() != 2) - return true; - - std::string nick = params[0]; - userrec* u = this->Instance->FindNick(prefix); - userrec* who = this->Instance->FindNick(nick); - - if (who) - { - /* Prepend kill source, if we don't have one */ - std::string sourceserv = prefix; - if (u) - { - sourceserv = u->server; - } - if (*(params[1].c_str()) != '[') - { - params[1] = "[" + sourceserv + "] Killed (" + params[1] +")"; - } - std::string reason = params[1]; - params[1] = ":" + params[1]; - Utils->DoOneToAllButSender(prefix,"KILL",params,sourceserv); - who->Write(":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str()); - userrec::QuitUser(this->Instance,who,reason); - } - return true; -} - bool TreeSocket::LocalPong(const std::string &prefix, std::deque ¶ms) { if (params.size() < 1) @@ -1239,10 +1209,6 @@ bool TreeSocket::ProcessLine(std::string &line) Utils->SetRemoteBursting(ServerSource, false); return this->ForceMode(prefix,params); } - else if (command == "KILL") - { - return this->RemoteKill(prefix,params); - } else if (command == "FTOPIC") { return this->ForceTopic(prefix,params); -- cgit v1.2.3