X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ffmode.cpp;h=3421f8045c4be52ed88817dbdc3dcc883f918576;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=e7209a85268e387d31130f62e16e3c7371ab8255;hpb=860d7530711857ff05993882be9c58cabe3bd3e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index e7209a852..3421f8045 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.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,15 +14,15 @@
 #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 */
 
 
 /** FMODE command - server mode with timestamp checks */
-bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &params)
+bool TreeSocket::ForceMode(const std::string &source, parameterlist &params)
 {
 	/* Chances are this is a 1.0 FMODE without TS */
 	if (params.size() < 3)
@@ -31,11 +31,10 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 		return true;
 	}
 
-	bool smode = false;
 	std::string sourceserv;
 
 	/* Are we dealing with an FMODE from a user, or from a server? */
-	User* who = this->Instance->FindNick(source);
+	User* who = this->ServerInstance->FindNick(source);
 	if (who)
 	{
 		/* FMODE from a user, set sourceserv to the users server name */
@@ -44,13 +43,11 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 	else
 	{
 		/* FMODE from a server, use a fake user to receive mode feedback */
-		who = this->Instance->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<std::string> modelist;
 	time_t TS = 0;
-	int n = 0;
 	for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
 	{
 		if (q == 1)
@@ -64,12 +61,12 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 		else
 		{
 			/* Everything else is fine to append to the modelist */
-			modelist[n++] = params[q];
+			modelist.push_back(params[q]);
 		}
 
 	}
 	/* Extract the TS value of the object, either User or Channel */
-	User* dst = this->Instance->FindNick(params[0]);
+	User* dst = this->ServerInstance->FindNick(params[0]);
 	Channel* chan = NULL;
 	time_t ourTS = 0;
 
@@ -79,7 +76,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 	}
 	else
 	{
-		chan = this->Instance->FindChan(params[0]);
+		chan = this->ServerInstance->FindChan(params[0]);
 		if (chan)
 		{
 			ourTS = chan->age;
@@ -91,8 +88,8 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 
 	if (!TS)
 	{
-		Instance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
-		Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
+		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
+		ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
 		return true;
 	}
 
@@ -100,14 +97,8 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 	 */
 	if (TS <= ourTS)
 	{
-		if (smode)
-		{
-			this->Instance->SendMode(modelist, who);
-		}
-		else
-		{
-			this->Instance->CallCommandHandler("MODE", modelist, who);
-		}
+		ServerInstance->Modes->Process(modelist, who, (who == Utils->ServerUser));
+
 		/* HOT POTATO! PASS IT ON! */
 		Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv);
 	}