Move all the parameters around AGAIN. See docs shortly

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

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 57629d74c1909245fde7144778f3f5e45371a612..b9bca310952933d8672b7dd0ed574df58f957a0e 100644 (file)
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -12,23 +12,13 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
-#include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
 #include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "m_spanningtree/treeserver.h"
+#include "m_spanningtree/utils.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 */
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &params)
 {
@@ -40,9 +30,20 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
 
        XLineFactory* xlf = Instance->XLines->GetFactory(params[0]);
 
+       std::string setter = "<unknown>";
+       User* usr = Instance->FindNick(prefix);
+       if (usr)
+               setter = usr->nick;
+       else
+       {
+               TreeServer* t = Utils->FindServer(prefix);
+               if (t)
+                       setter = t->GetName().c_str();
+       }
+
        if (!xlf)
        {
-               this->Instance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",prefix.c_str(),params[0].c_str());
+               this->Instance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
                return true;
        }
 
@@ -52,12 +53,12 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
        {
                if (xl->duration)
                {
-                       this->Instance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",prefix.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+                       this->Instance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
                                        params[1].c_str(),Instance->TimeString(xl->expiry).c_str(),params[5].c_str());
                }
                else
                {
-                       this->Instance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",prefix.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+                       this->Instance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
                                        params[1].c_str(),params[5].c_str());
                }
                params[5] = ":" + params[5];
@@ -65,7 +66,7 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
                User* u = Instance->FindNick(prefix);
                Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
                TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
-               
+
                if (!remoteserver->bursting)
                {
                        Instance->XLines->ApplyLines();