Merge pull request #495 from SaberUK/master+fix-libcpp

[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 3bafe5b2f8e0d07a7c9b6d0b956949596d8f9393..fedadedb5d9ce60970e98c613969e9fe3fa3d35d 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,45 +1,48 @@
-/*       +------------------------------------+
- *       | 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 "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 (InspIRCd::Match(ServerInstance->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(ServerInstance);
+                       parameterlist plist(params.begin() + 2, params.end());
+                       ServerInstance->Parser->CallHandler(params[1], plist, who);
+                       // discard return value, ENCAP shall succeed even if the command does not exist
                }
 
-               if (params[0].find('*') != std::string::npos)
+               params[params.size() - 1] = ":" + params[params.size() - 1];
+
+               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;
 }