X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmodules.cpp;h=6c91327946d126261abb55f8d4bcf669cdc0f3df;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=fe6ca8434ec8e38e4207dfd1484f01769acc5c0f;hpb=78dabca366d4bf150254934ce9dae816c2894d91;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/modules.cpp b/src/modules/m_spanningtree/modules.cpp
index fe6ca8434..6c9132794 100644
--- a/src/modules/m_spanningtree/modules.cpp
+++ b/src/modules/m_spanningtree/modules.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,19 +14,19 @@
 #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 */
 
 
-bool TreeSocket::Modules(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::Modules(const std::string &prefix, parameterlist &params)
 {
 	if (params.empty())
 		return true;
 
-	if (!InspIRCd::Match(this->Instance->Config->ServerName, params[0]))
+	if (!InspIRCd::Match(this->ServerInstance->Config->ServerName, params[0]))
 	{
 		/* Pass it on, not for us */
 		Utils->DoOneToOne(prefix, "MODULES", params, params[0]);
@@ -34,19 +34,19 @@ bool TreeSocket::Modules(const std::string &prefix, std::deque<std::string> &par
 	}
 
 	char strbuf[MAXBUF];
-	std::deque<std::string> par;
+	parameterlist par;
 	par.push_back(prefix);
 	par.push_back("");
 
-	User* source = this->Instance->FindNick(prefix);
+	User* source = this->ServerInstance->FindNick(prefix);
 	if (!source)
 		return true;
 
-	std::vector<std::string> module_names = Instance->Modules->GetAllModuleNames(0);
+	std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
 
 	for (unsigned int i = 0; i < module_names.size(); i++)
 	{
-		Module* m = Instance->Modules->Find(module_names[i]);
+		Module* m = ServerInstance->Modules->Find(module_names[i]);
 		Version V = m->GetVersion();
 
 		if (IS_OPER(source))
@@ -57,18 +57,18 @@ bool TreeSocket::Modules(const std::string &prefix, std::deque<std::string> &par
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			snprintf(strbuf, MAXBUF, "::%s 702 %s :0x%08lx %s %s :%s", Instance->Config->ServerName, source->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
+			snprintf(strbuf, MAXBUF, "::%s 702 %s :0x%08lx %s %s :%s", ServerInstance->Config->ServerName, source->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
 		}
 		else
 		{
-			snprintf(strbuf, MAXBUF, "::%s 702 %s :%s", Instance->Config->ServerName, source->nick.c_str(), module_names[i].c_str());
+			snprintf(strbuf, MAXBUF, "::%s 702 %s :%s", ServerInstance->Config->ServerName, source->nick.c_str(), module_names[i].c_str());
 		}
 		par[1] = strbuf;
-		Utils->DoOneToOne(Instance->Config->GetSID(), "PUSH", par, source->server);
+		Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", par, source->server);
 	}
-	snprintf(strbuf, MAXBUF, "::%s 703 %s :End of MODULES list", Instance->Config->ServerName, source->nick.c_str());
+	snprintf(strbuf, MAXBUF, "::%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName, source->nick.c_str());
 	par[1] = strbuf;
-	Utils->DoOneToOne(Instance->Config->GetSID(), "PUSH", par, source->server);
+	Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", par, source->server);
 	return true;
 }