Fix build of m_spanningtree and display of dependency regeneration

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

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 00fd9eb3a4ed521097ba228503e5cd3492983ada..8d95395ed18555b4d4e9190e191c52f701e627c6 100644 (file)
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.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,37 +15,35 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.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 "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "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 */
+/* $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]);
+       User* u = this->ServerInstance->FindNick(params[0]);
+       Channel* c = this->ServerInstance->FindChan(params[1]);
 
        if (u)
        {
                /* 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);
        }