X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvspart.cpp;h=95d1a1c2337a86eb226afbca6837c016a3fd608b;hb=517a26252a091eaee0149458a86fc43731bce618;hp=00fd9eb3a4ed521097ba228503e5cd3492983ada;hpb=a3f89e772514aca9aa4615ebe1656010111fc455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 00fd9eb3a..95d1a1c23 100644
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -15,7 +15,6 @@
 #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"
@@ -23,20 +22,19 @@
 #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"
 
-/* $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 */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 bool TreeSocket::ServicePart(const std::string &prefix, std::deque<std::string> &params)
 {
 	if (params.size() < 2)
 		return true;
 
-	if (!this->Instance->IsChannel(params[1].c_str()))
-		return true;
+	std::string reason = "Services forced part";
+
+	if (params.size() == 3)
+		reason = params[2];
 
 	User* u = this->Instance->FindNick(params[0]);
 	Channel* c = this->Instance->FindChan(params[1]);
@@ -45,7 +43,7 @@ bool TreeSocket::ServicePart(const std::string &prefix, std::deque<std::string>
 	{
 		/* only part if it's local, otherwise just pass it on! */
 		if (IS_LOCAL(u))
-			if (!c->PartUser(u, "Services forced part"))
+			if (!c->PartUser(u, reason))
 				delete c;
 		Utils->DoOneToAllButSender(prefix,"SVSPART",params,prefix);
 	}