Revert automated conversion by Special, as it (unfortunately) neglects some details...

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

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index a3213625808aabafa6e2df6d6b0266b35e411a65..e8c398f6be204740dce1c16eeab63c2a193d7420 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -26,12 +26,23 @@ bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &par
        if (params.size() < 2)
                return true;
 
+       std::string setter = "<unknown>";
+
        User* user = Instance->FindNick(prefix);
+       if (user)
+               setter = user->nick;
+       else
+       {
+               TreeServer* t = Utils->FindServer(prefix);
+               if (t)
+                       setter = t->GetName().c_str();
+       }
+
 
        /* NOTE: No check needed on 'user', this function safely handles NULL */
-       if (Instance->XLines->DelLine(params[0].c_str(), params[1], user))
+       if (Instance->XLines->DelLine(params[1].c_str(), params[0], user))
        {
-               this->Instance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", prefix.c_str(),
+               this->Instance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", setter.c_str(),
                                params[0].c_str(), params[0].length() == 1 ? "LINE" : "", params[1].c_str());
                Utils->DoOneToAllButSender(prefix,"DELLINE", params, prefix);
        }