X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_squit.cpp;h=6d82f43dba7a5bd8b5cab61f0e483277ef1f8566;hb=ca4c4a67988419b9eb479ffcf82238dc1648b0ad;hp=2a95acb407633a653971ca637029b4704bf1ec20;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 2a95acb40..6d82f43db 100644
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -21,7 +21,6 @@
 
 #include "inspircd.h"
 #include "socket.h"
-#include "xline.h"
 
 #include "main.h"
 #include "utils.h"
@@ -37,7 +36,7 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parame
 	{
 		if (s == Utils->TreeRoot)
 		{
-			user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick.c_str(),parameters[0].c_str());
+			user->WriteNotice("*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (" + parameters[0] + " matches local server name)");
 			return MOD_RES_DENY;
 		}
 
@@ -46,18 +45,18 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parame
 		if (sock)
 		{
 			ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0].c_str(),user->nick.c_str());
-			sock->Squit(s,std::string("Server quit by ") + user->GetFullRealHost());
+			sock->Squit(s,"Server quit by " + user->GetFullRealHost());
 			ServerInstance->SE->DelFd(sock);
 			sock->Close();
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** SQUIT may not be used to remove remote servers. Please use RSQUIT instead.",user->nick.c_str());
+			user->WriteNotice("*** SQUIT may not be used to remove remote servers. Please use RSQUIT instead.");
 		}
 	}
 	else
 	{
-		 user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick.c_str(),parameters[0].c_str());
+		 user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network.");
 	}
 	return MOD_RES_DENY;
 }