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

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 175257b0a..fedadedb5 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,52 +1,48 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 "treesocket.h"
-#include "treeserver.h"
 #include "utils.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-
-
 /** ENCAP */
-bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
+void TreeSocket::Encap(User* who, parameterlist &params)
 {
 	if (params.size() > 1)
 	{
-		if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
+		if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
 		{
-			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);
+			ServerInstance->Parser->CallHandler(params[1], 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)
+		if (params[0].find_first_of("*?") != std::string::npos)
 		{
-			Utils->DoOneToAllButSender(prefix, "ENCAP", params, prefix);
+			Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
 		}
 		else
-			Utils->DoOneToOne(prefix, "ENCAP", params, params[0]);
+			Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
 	}
-	return true;
 }