X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fdelline.cpp;h=e376147fdb80a883905ba4affa80736c7ab783f3;hb=b4599531f97a9e6207b6bb8d728d7523b6995523;hp=540ca50792dcf25a4e822fd4dd6182731f0771ed;hpb=02859be56d43bcece02aab350e02bc95ed1bf446;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 540ca5079..e376147fd 100644
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -20,38 +20,19 @@
 #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, Params& 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();
-	}
+	const std::string& setter = user->nick;
+	std::string reason;
 
-
-	/* NOTE: No check needed on 'user', this function safely handles NULL */
-	if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
+	// XLineManager::DelLine() returns true if the xline existed, false if it didn't
+	if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], reason, 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);
+		ServerInstance->SNO->WriteToSnoMask('X', "%s removed %s%s on %s: %s", setter.c_str(),
+				params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str(), reason.c_str());
+		return CMD_SUCCESS;
 	}
-	return true;
+	return CMD_FAILURE;
 }
-