m_spanningtree: Resolve issue #250

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

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index efc00334d96faf5f4ec791b665a6160e1696600c..3ab5dae9df0c9aa5b54fed4fc8c53e4f244bb10d 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -48,7 +48,7 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
 
 bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap)
 {
-       if (encap[0].find('*') != std::string::npos)
+       if (encap[0].find_first_of("*?") != std::string::npos)
        {
                Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap);
                return true;
@@ -164,26 +164,16 @@ void SpanningTreeProtocolInterface::SendChannelNotice(Channel* target, char stat
 
 void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::string &text)
 {
-       TreeServer* serv = Utils->FindServer(target->server);
-       if (serv)
-       {
-               TreeSocket* sock = serv->GetSocket();
-               if (sock)
-               {
-                       sock->WriteLine(":" + ServerInstance->Config->GetSID() + " PRIVMSG " + target->nick + " :"+text);
-               }
-       }
+       parameterlist p;
+       p.push_back(target->uuid);
+       p.push_back(":" + text);
+       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PRIVMSG", p, target->server);
 }
 
 void SpanningTreeProtocolInterface::SendUserNotice(User* target, const std::string &text)
 {
-       TreeServer* serv = Utils->FindServer(target->server);
-       if (serv)
-       {
-               TreeSocket* sock = serv->GetSocket();
-               if (sock)
-               {
-                       sock->WriteLine(":" + ServerInstance->Config->GetSID() + " NOTICE " + target->nick + " :"+text);
-               }
-       }
+       parameterlist p;
+       p.push_back(target->uuid);
+       p.push_back(":" + text);
+       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "NOTICE", p, target->server);
 }