X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=8ba5f90ab177e43f47850b694d60684adad1eb84;hb=192fa7d3138ccb5929dc9af8de3395d6ea25619c;hp=663baa089327ddcbe67075b510ffeee4c23db630;hpb=c819f500c5eb9ad907e5e9a71c525afd2ccaee0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 663baa089..8ba5f90ab 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.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.
@@ -14,9 +14,9 @@
 #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 */
 
@@ -27,21 +27,20 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
 	if (params.size() != 4)
 		return true;
 	time_t ts = atoi(params[1].c_str());
-	std::string nsource = source;
-	Channel* c = this->Instance->FindChan(params[0]);
+	Channel* c = this->ServerInstance->FindChan(params[0]);
 	if (c)
 	{
 		if ((ts >= c->topicset) || (c->topic.empty()))
 		{
-			User* user = this->Instance->FindNick(source);
-
 			if (c->topic != params[3])
 			{
+				User* user = this->ServerInstance->FindNick(source);
 				// Update topic only when it differs from current topic
-				c->topic.assign(params[3], 0, Instance->Config->Limits.MaxTopic);
+				c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
 				if (!user)
 				{
-					c->WriteChannelWithServ(Instance->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
 				{
@@ -53,27 +52,9 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
 			c->setby.assign(params[2], 0, 127);
 			c->topicset = ts;
 
-			/*
-			 * Take careful note of what happens here;
-			 * Above, we display the topic change to the server IF the topic incoming is different to the topic already set.
-			 * HERE, we find the server the user that sent this topic is on, so we *do not* send topics back to the link they just
-			 * came from. This *cannot* be easily merged with the above check!
-			 *
-			 * Thanks to Anope and Namegduf for finally helping me isolate this
-			 *			-- w00t (5th/aug/2008)
-			 */
-			if (user)
-			{
-				nsource = user->server;
-			}
-
 			/* all done, send it on its way */
 			params[3] = ":" + params[3];
-			User* u = Instance->FindNick(nsource);
-			if (u)
-				Utils->DoOneToAllButSender(u->uuid,"FTOPIC",params,u->server);
-			else
-				Utils->DoOneToAllButSender(source,"FTOPIC",params,nsource);
+			Utils->DoOneToAllButSender(source,"FTOPIC",params,source);
 		}
 
 	}