X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fencap.cpp;h=51194e6d7e902b9af416d2eb5cb172f3bb70efcc;hb=f293861ab70eab76ae0715a5f2c2769de332c779;hp=247fd63127d93b14de7a97dd94fca9697cc11fde;hpb=ab5858c141c5dfda2502a414271748a02470104d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 247fd6312..51194e6d7 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,63 +1,49 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
-
-
-/** remote MOTD. leet, huh? */
-bool TreeSocket::Encap(const std::string &prefix, std::deque<std::string> &params)
+/** ENCAP */
+void TreeSocket::Encap(User* who, parameterlist &params)
 {
 	if (params.size() > 1)
 	{
-		if (Instance->MatchText(Instance->Config->GetSID(), params[0]))
+		if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
 		{
-			Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-			event.Send(Instance);
-
-			return true;
-		}
-		else
-		{
-			User* u = Instance->FindNick(params[0]);
-
-			if (u && IS_LOCAL(u))
-			{
-				Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-				event.Send(Instance);
-			}
-
-			return true;
+			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)
 		{
-			User* u = Instance->FindNick(params[0]);
-			if (u)
-				Utils->DoOneToAllButSender(prefix, "ENCAP", params, u->server);
-			else
-				Utils->DoOneToAllButSender(prefix, "ENCAP", params, params[0]);
+			Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
 		}
 		else
-			Utils->DoOneToOne(prefix, "ENCAP", params, prefix);
+			Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
 	}
-	return true;
 }