Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 8f330cd1c6e128b8393a07685d115f6839fbb211..5a6656e3ee83d9a422bc2a20842b98e980184d60 100644 (file)
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -14,32 +14,33 @@
 #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 */
 
 
 /** FTOPIC command */
-bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &params)
+bool TreeSocket::ForceTopic(const std::string &source, parameterlist &params)
 {
        if (params.size() != 4)
                return true;
        time_t ts = atoi(params[1].c_str());
-       Channel* c = this->ServerInstance->FindChan(params[0]);
+       Channel* c = ServerInstance->FindChan(params[0]);
        if (c)
        {
                if ((ts >= c->topicset) || (c->topic.empty()))
                {
                        if (c->topic != params[3])
                        {
-                               User* user = this->ServerInstance->FindNick(source);
+                               User* user = ServerInstance->FindNick(source);
                                // Update topic only when it differs from current topic
                                c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
                                if (!user)
                                {
-                                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
+                                       std::string sourceserv = Utils->FindServer(source)->GetName();
+                                       c->WriteChannelWithServ(sourceserv.c_str(), "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
                                }
                                else
                                {