X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fdelline.cpp;h=f790dc885d8a7e50257b4b4d09e72115a790403e;hb=eef45dbfb90f951f3048038aea3ff68b5c157f6d;hp=5d88b4a0bdf88e8b39a96edbf7766c8e8cd83dfc;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 5d88b4a0b..f790dc885 100644
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -20,38 +20,18 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-
-bool TreeSocket::DelLine(const std::string &prefix, parameterlist &params)
+CmdResult CommandDelLine::Handle(User* user, std::vector<std::string>& params)
 {
-	if (params.size() < 2)
-		return true;
-
-	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();
-	}
+	const std::string& setter = user->nick;
 
-
-	/* NOTE: No check needed on 'user', this function safely handles NULL */
+	// XLineManager::DelLine() returns true if the xline existed, false if it didn't
 	if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
 	{
 		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);
+		return CMD_SUCCESS;
 	}
-	return true;
+	return CMD_FAILURE;
 }
-