From 97c0e6b4c4e304a1c4e764fc06a7e2663a41743d Mon Sep 17 00:00:00 2001 From: danieldg Date: Wed, 13 May 2009 17:04:17 +0000 Subject: Use Utils->ServerUser instead of ServerInstance->FakeClient in m_spanningtree This makes it possible to determine which server initiated a mode change, instead of having only a flag saying that some server did. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11379 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/fmode.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/modules/m_spanningtree/fmode.cpp') diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp index 24047226d..2d9c37339 100644 --- a/src/modules/m_spanningtree/fmode.cpp +++ b/src/modules/m_spanningtree/fmode.cpp @@ -31,7 +31,6 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque &p return true; } - bool smode = false; std::string sourceserv; /* Are we dealing with an FMODE from a user, or from a server? */ @@ -44,8 +43,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque &p else { /* FMODE from a server, use a fake user to receive mode feedback */ - who = this->ServerInstance->FakeClient; - smode = true; /* Setting this flag tells us it is a server mode*/ + who = Utils->ServerUser; sourceserv = source; /* Set sourceserv to the actual source string */ } std::vector modelist; @@ -99,14 +97,8 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque &p */ if (TS <= ourTS) { - if (smode) - { - this->ServerInstance->SendMode(modelist, who); - } - else - { - this->ServerInstance->CallCommandHandler("MODE", modelist, who); - } + ServerInstance->Modes->Process(modelist, who, (who == Utils->ServerUser)); + /* HOT POTATO! PASS IT ON! */ Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv); } -- cgit v1.3.1-10-gc9f91