X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Faddline.cpp;h=2ee8401fa36c4126f9a7ec2face773bdb5b000e9;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=db9a7f2d6e49fc4cfdfecf91f371d7f6a3bee0e6;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index db9a7f2d6..2ee8401fa 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -20,76 +20,58 @@
 #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::AddLine(const std::string &prefix, parameterlist &params)
+CmdResult CommandAddLine::Handle(User* usr, std::vector<std::string>& params)
 {
-	if (params.size() < 6)
-	{
-		ServerInstance->SNO->WriteToSnoMask('d',"%s sent me a malformed ADDLINE of type %s.",prefix.c_str(),params[0].c_str());
-		return true;
-	}
-
 	XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]);
-
-	std::string setter = "<unknown>";
-	User* usr = ServerInstance->FindNick(prefix);
-	if (usr)
-		setter = usr->nick;
-	else
-	{
-		TreeServer* t = Utils->FindServer(prefix);
-		if (t)
-			setter = t->GetName().c_str();
-	}
+	const std::string& setter = usr->nick;
 
 	if (!xlf)
 	{
 		ServerInstance->SNO->WriteToSnoMask('d',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
-		return true;
+		return CMD_FAILURE;
 	}
 
 	XLine* xl = NULL;
 	try
 	{
-		xl = xlf->Generate(ServerInstance->Time(), atoi(params[4].c_str()), params[2], params[5], params[1]);
+		xl = xlf->Generate(ServerInstance->Time(), ConvToInt(params[4]), params[2], params[5], params[1]);
 	}
 	catch (ModuleException &e)
 	{
 		ServerInstance->SNO->WriteToSnoMask('d',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
-		return true;
+		return CMD_FAILURE;
 	}
-	xl->SetCreateTime(atoi(params[3].c_str()));
+	xl->SetCreateTime(ConvToInt(params[3]));
 	if (ServerInstance->XLines->AddLine(xl, NULL))
 	{
 		if (xl->duration)
 		{
+			std::string timestr = ServerInstance->TimeString(xl->expiry);
 			ServerInstance->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(),ServerInstance->TimeString(xl->expiry).c_str(),params[5].c_str());
+					params[1].c_str(), timestr.c_str(), params[5].c_str());
 		}
 		else
 		{
 			ServerInstance->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];
 
-		User* u = ServerInstance->FindNick(prefix);
-		Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
-		TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
+		TreeServer* remoteserver = Utils->FindServer(usr->server);
 
 		if (!remoteserver->bursting)
 		{
 			ServerInstance->XLines->ApplyLines();
 		}
+		return CMD_SUCCESS;
 	}
 	else
+	{
 		delete xl;
-
-	return true;
+		return CMD_FAILURE;
+	}
 }