Fix use of commasepstream on now space-separated items

[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 c56f8dc74f0437f9ee9f45c3c140f992cd6764f2..9d16801553db74617d2693dafdc6030a49f4e55e 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,26 +22,26 @@
 
 
 
-/** remote MOTD. leet, huh? */
-bool TreeSocket::Encap(const std::string &prefix, parameterlist &params)
+/** ENCAP */
+void TreeSocket::Encap(User* who, parameterlist &params)
 {
        if (params.size() > 1)
        {
                if (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
                {
-                       Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-                       event.Send(ServerInstance);
+                       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)
                {
-                       Utils->DoOneToAllButSender(prefix, "ENCAP", params, prefix);
+                       Utils->DoOneToAllButSender(who->server, "ENCAP", params, who->server);
                }
                else
-                       Utils->DoOneToOne(prefix, "ENCAP", params, params[0]);
+                       Utils->DoOneToOne(who->server, "ENCAP", params, params[0]);
        }
-       return true;
 }