X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fencap.cpp;h=175257b0a804e64b02865ef8432a606a539d06db;hb=e2af2347fc035d702e45f12e772223a8d578410d;hp=9335c0c7f235940c6e0123e871dc8e512f82d62f;hpb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 9335c0c7f..175257b0a 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.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,24 +14,31 @@
 #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 */
 
 
 
-/** remote MOTD. leet, huh? */
-bool TreeSocket::Encap(const std::string &prefix, std::deque<std::string> &params)
+/** ENCAP */
+bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
 {
 	if (params.size() > 1)
 	{
-		if (Instance->MatchText(Instance->Config->GetSID(), params[0]))
+		if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
 		{
-			Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-			event.Send(Instance);
+			User* who = ServerInstance->FindUUID(prefix);
+			if (!who)
+				who = Utils->ServerUser;
+
+			parameterlist plist(params.begin() + 2, params.end());
+			ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
+			// discard return value, ENCAP shall succeed even if the command does not exist
 		}
+		
+		params[params.size() - 1] = ":" + params[params.size() - 1];
 
 		if (params[0].find('*') != std::string::npos)
 		{