Remove $Core and $Mod* comments apart from $ModDep.

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

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index c10bccaf9bcaeda151230b03423fb5e55e207c0c..476453e2036180f152273ec2ddf28eca7592bf03 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -25,20 +25,15 @@
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h */
 
-void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, LocalUser *user, CmdResult result, const std::string &original_line)
+void ModuleSpanningTree::OnPostCommand(Command* command, const std::vector<std::string>& parameters, LocalUser* user, CmdResult result, const std::string& original_line)
 {
        if (result == CMD_SUCCESS)
                Utils->RouteCommand(NULL, command, parameters, user);
 }
 
-void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user)
+void SpanningTreeUtilities::RouteCommand(TreeServer* origin, Command* thiscmd, const parameterlist& parameters, User* user)
 {
-       if (!ServerInstance->Parser->IsValidCommand(command, parameters.size(), user))
-               return;
-
-       /* We know it's non-null because IsValidCommand returned true */
-       Command* thiscmd = ServerInstance->Parser->GetHandler(command);
-
+       const std::string& command = thiscmd->name;
        RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
 
        std::string sent_cmd = command;
@@ -46,15 +41,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 
        if (routing.type == ROUTE_TYPE_LOCALONLY)
        {
-               /* Broadcast when it's a core command with the default route descriptor and the source is a
-                * remote user or a remote server
-                */
-
-               Version ver = thiscmd->creator->GetVersion();
-               if ((!(ver.Flags & VF_CORE)) || (IS_LOCAL(user)) || (IS_SERVER(user) == ServerInstance->FakeClient))
-                       return;
-
-               routing = ROUTE_BROADCAST;
+               return;
        }
        else if (routing.type == ROUTE_TYPE_OPT_BCAST)
        {
@@ -67,7 +54,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
                TreeServer* sdest = FindServer(routing.serverdest);
                if (!sdest)
                {
-                       ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Trying to route ENCAP to nonexistant server %s",
+                       ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Trying to route ENCAP to nonexistant server %s",
                                routing.serverdest.c_str());
                        return;
                }
@@ -82,14 +69,13 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 
                if (!(ver.Flags & (VF_COMMON | VF_CORE)) && srcmodule != Creator)
                {
-                       ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Routed command %s from non-VF_COMMON module %s",
+                       ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Routed command %s from non-VF_COMMON module %s",
                                command.c_str(), srcmodule->ModuleSourceFile.c_str());
                        return;
                }
        }
 
-       std::string output_text;
-       ServerInstance->Parser->TranslateUIDs(thiscmd->translation, parameters, output_text, true, thiscmd);
+       std::string output_text = CommandParser::TranslateUIDs(thiscmd->translation, parameters, true, thiscmd);
 
        params.push_back(output_text);