X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fkill.cpp;h=c2026d0bb4d8fcca9c1660edfb4e6b43f1c28521;hb=a02ed18a1a1ae42fd81452b6ca5809fc3430a04c;hp=93bed9bbea58d9a245f9e7733a455ab5ff542c34;hpb=c6ca1cd62688c3a012b138ad33131a700fe7bbc5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp
index 93bed9bbe..c2026d0bb 100644
--- 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.
@@ -15,36 +15,38 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.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()) != '[')
+		if (*(params[1].c_str()) != 'K')
 		{
-			TreeServer* ts = Utils->FindServer(prefix);
-			params[1] = "[" + (ts ? ts->GetName() : 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.c_str(), prefix.c_str(), reason.c_str());
-		this->Instance->Users->QuitUser(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;
 }