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 / encap.cpp

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 247fd63127d93b14de7a97dd94fca9697cc11fde..02233e91678cc51db1bcadec52ca1d49d7742b25 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -27,36 +27,18 @@ bool TreeSocket::Encap(const std::string &prefix, std::deque<std::string> &param
 {
        if (params.size() > 1)
        {
-               if (Instance->MatchText(Instance->Config->GetSID(), params[0]))
+               if (InspIRCd::Match(Instance->Config->GetSID(), params[0]))
                {
                        Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
                        event.Send(Instance);
-
-                       return true;
-               }
-               else
-               {
-                       User* u = Instance->FindNick(params[0]);
-
-                       if (u && IS_LOCAL(u))
-                       {
-                               Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-                               event.Send(Instance);
-                       }
-
-                       return true;
                }
 
                if (params[0].find('*') != std::string::npos)
                {
-                       User* u = Instance->FindNick(params[0]);
-                       if (u)
-                               Utils->DoOneToAllButSender(prefix, "ENCAP", params, u->server);
-                       else
-                               Utils->DoOneToAllButSender(prefix, "ENCAP", params, params[0]);
+                       Utils->DoOneToAllButSender(prefix, "ENCAP", params, prefix);
                }
                else
-                       Utils->DoOneToOne(prefix, "ENCAP", params, prefix);
+                       Utils->DoOneToOne(prefix, "ENCAP", params, params[0]);
        }
        return true;
 }