*/
#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/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.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 */
bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> ¶ms)
{
if (params.size() < 2)
return true;
- User* user = Instance->FindNick(prefix);
+ std::string setter = "<unknown>";
+
+ User* user = ServerInstance->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 (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
{
- this->Instance->SNO->WriteToSnoMask('x',"%s removed %s%s on %s.", prefix.c_str(),
+ this->ServerInstance->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);
}