Replace std::deque with std::vector in spanningtree and related modules

[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..c2026d0bb4d8fcca9c1660edfb4e6b43f1c28521 100644 (file)
--- a/src/modules/m_spanningtree/kill.cpp
+++ b/src/modules/m_spanningtree/kill.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.
@@ -11,46 +11,42 @@
  * ---------------------------------------------------
  */
 
+
 #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 "treesocket.h"
+#include "treeserver.h"
+#include "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)
-{       
+bool TreeSocket::RemoteKill(const std::string &prefix, parameterlist &params)
+{
        if (params.size() != 2)
                return true;
 
-       User* who = this->Instance->FindNick(params[0]);
+       User* who = this->ServerInstance->FindNick(params[0]);
 
        if (who)
        {
-               /* Prepend kill source, if we don't have one */          
-               if (*(params[1].c_str()) != '[')
+               /* Prepend kill source, if we don't have one */
+               if (*(params[1].c_str()) != 'K')
                {
-                       params[1] = "[" + prefix + "] Killed (" + params[1] +")";
+                       params[1] = "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);
+               TreeServer* src = Utils->FindServer(prefix);
+               if (src)
+               {
+                       // this shouldn't ever be null, but it doesn't hurt to check
+                       who->Write(":%s KILL %s :%s (%s)", src->GetName().c_str(), who->nick.c_str(), src->GetName().c_str(), reason.c_str());
+               }
+               this->ServerInstance->Users->QuitUser(who, reason);
        }
        return true;
 }