m_namedmodes Only show chan key to members and opers with channels/auspex

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / encap.cpp

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index e854df2f4740a3f7d0e90756408c40ac236600c7..dabfc086bce5542b138d4638b074b8edbfd0acfe 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | 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"
 
@@ -18,30 +24,26 @@
 #include "treeserver.h"
 #include "utils.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-
-
 /** ENCAP */
 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]))
                {
                        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(who->server, "ENCAP", params, who->server);
+                       Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
                }
                else
-                       Utils->DoOneToOne(who->server, "ENCAP", params, params[0]);
+                       Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
        }
 }