Sync helpop chmodes s and p with docs

[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 95f8f4e4a7da0ea4b7f7f6da73cfc7efda3185c7..3f509bc5cbd28839ab05ec5d85e767a9b79220f8 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,7 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -20,13 +25,24 @@
 #include "inspircd.h"
 
 #include "commands.h"
+#include "main.h"
 
 /** ENCAP */
-CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandEncap::Handle(User* user, Params& params)
 {
        if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
        {
-               parameterlist plist(params.begin() + 2, params.end());
+               CommandBase::Params plist(params.begin() + 2, params.end());
+
+               // XXX: Workaround for SVS* commands provided by spanningtree not being registered in the core
+               if ((params[1] == "SVSNICK") || (params[1] == "SVSJOIN") || (params[1] == "SVSPART"))
+               {
+                       ServerCommand* const scmd = Utils->Creator->CmdManager.GetHandler(params[1]);
+                       if (scmd)
+                               scmd->Handle(user, plist);
+                       return CMD_SUCCESS;
+               }
+
                Command* cmd = NULL;
                ServerInstance->Parser.CallHandler(params[1], plist, user, &cmd);
                // Discard return value, ENCAP shall succeed even if the command does not exist
@@ -37,7 +53,7 @@ CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandEncap::GetRouting(User* user, const std::vector<std::string>& params)
+RouteDescriptor CommandEncap::GetRouting(User* user, const Params& params)
 {
        if (params[0].find_first_of("*?") != std::string::npos)
                return ROUTE_BROADCAST;