Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

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

diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 78adae28cf007d85a7cc1cfc705f68934309b4b1..7fbbf4d58d4389295a8356d53881efdab2275466 100644 (file)
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -15,11 +15,9 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
 
-#include "m_spanningtree/timesynctimer.h"
 #include "m_spanningtree/resolvers.h"
 #include "m_spanningtree/main.h"
 #include "m_spanningtree/utils.h"
@@ -28,7 +26,7 @@
 #include "m_spanningtree/treesocket.h"
 #include "m_spanningtree/rconnect.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h */
+/* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h */
 
 cmd_rconnect::cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RCONNECT", "o", 2), Creator(Callback), Utils(Util)
 {
@@ -49,14 +47,15 @@ CmdResult cmd_rconnect::Handle (const std::vector<std::string>& parameters, User
        }
 
        /* Is this aimed at our server? */
-       if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0]))
+       if (InspIRCd::Match(ServerInstance->Config->ServerName,parameters[0]))
        {
                /* Yes, initiate the given connect */
                ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick.c_str(),parameters[0].c_str(),parameters[1].c_str());
                std::vector<std::string> para;
                para.push_back(parameters[1]);
-               std::string original_command = std::string("CONNECT ") + parameters[1];
-               Creator->OnPreCommand("CONNECT", para, user, true, original_command);
+               std::string cmd("CONNECT");
+               std::string original_command = cmd + " " + parameters[1];
+               Creator->OnPreCommand(cmd, para, user, true, original_command);
        }
        return CMD_SUCCESS;
 }