Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

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

diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp
index 12c3d033f1d185e419908bc9472451a0a97db9ba..93bed9bbea58d9a245f9e7733a455ab5ff542c34 100644 (file)
--- a/src/modules/m_spanningtree/kill.cpp
+++ b/src/modules/m_spanningtree/kill.cpp
@@ -11,27 +11,20 @@
  * ---------------------------------------------------
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
-#include "socketengine.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/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "m_spanningtree/treeserver.h"
+#include "m_spanningtree/utils.h"
+
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.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 */
 
 bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &params)
-{       
+{
        if (params.size() != 2)
                return true;
 
@@ -39,18 +32,19 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &
 
        if (who)
        {
-               /* Prepend kill source, if we don't have one */          
+               /* Prepend kill source, if we don't have one */
                if (*(params[1].c_str()) != '[')
                {
-                       params[1] = "[" + prefix + "] Killed (" + params[1] +")";
+                       TreeServer* ts = Utils->FindServer(prefix);
+                       params[1] = "[" + (ts ? ts->GetName() : prefix) + "] Killed (" + params[1] +")";
                }
                std::string reason = params[1];
                params[1] = ":" + params[1];
                Utils->DoOneToAllButSender(prefix,"KILL",params,prefix);
                // NOTE: This is safe with kill hiding on, as RemoteKill is only reached if we have a server prefix.
                // in short this is not executed for USERS.
-               who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick, prefix.c_str(), reason.c_str());
-               User::QuitUser(this->Instance,who,reason);
+               who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick.c_str(), prefix.c_str(), reason.c_str());
+               this->Instance->Users->QuitUser(who, reason);
        }
        return true;
 }