X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showfile.cpp;h=150b43ebcb9cf73d2900468a496313d20f021c89;hb=8ec9a73a91ad1c7009fd3055fbad7c980b5e1732;hp=2d1354affcf07ca7fcd95632656886ea603d11b5;hpb=48a400f2e068527b338ceecf8ed1dde2da971ca9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 2d1354aff..150b43ebc 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -51,25 +51,27 @@ class CommandShowFile : public Command
 	{
 	}
 
-	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (method == SF_NUMERIC)
 		{
-			if (!introtext.empty())
+			if (!introtext.empty() && intronumeric)
 				user->WriteRemoteNumeric(intronumeric, introtext);
 
 			for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
 				user->WriteRemoteNumeric(textnumeric, InspIRCd::Format("- %s", i->c_str()));
 
-			user->WriteRemoteNumeric(endnumeric, endtext.c_str());
+			if (!endtext.empty() && endnumeric)
+				user->WriteRemoteNumeric(endnumeric, endtext.c_str());
 		}
-		else
+		else if (IS_LOCAL(user))
 		{
-			const char* msgcmd = (method == SF_MSG ? "PRIVMSG" : "NOTICE");
+			LocalUser* const localuser = IS_LOCAL(user);
 			for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
 			{
 				const std::string& line = *i;
-				user->WriteCommand(msgcmd, ":" + line);
+				ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, localuser, line, ((method == SF_MSG) ? MSG_PRIVMSG : MSG_NOTICE));
+				localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
 			}
 		}
 		return CMD_SUCCESS;
@@ -91,8 +93,7 @@ class CommandShowFile : public Command
 			method = SF_NOTICE;
 
 		contents = filecontents;
-		if (tag->getBool("colors"))
-			InspIRCd::ProcessColors(contents);
+		InspIRCd::ProcessColors(contents);
 	}
 };