X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showfile.cpp;h=99c54514007fcd615d1c39556e3e2d38b741d5a7;hb=dccf47d0a091be2395257d401f8ed55eaa258bc7;hp=57c501e909c7e5704eda3ccdbde37d496cb45b33;hpb=5267fb9d362aeb326c9e64f7171c957f76776f90;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 57c501e90..99c545140 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -19,6 +19,15 @@
 
 #include "inspircd.h"
 
+enum
+{
+	// From UnrealIRCd.
+	RPL_RULES = 232,
+	RPL_RULESTART = 308,
+	RPL_RULESEND = 309,
+	ERR_NORULES = 434
+};
+
 class CommandShowFile : public Command
 {
 	enum Method
@@ -42,7 +51,7 @@ 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)
 		{
@@ -54,13 +63,14 @@ class CommandShowFile : public Command
 
 			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;
@@ -70,9 +80,9 @@ class CommandShowFile : public Command
 	{
 		introtext = tag->getString("introtext", "Showing " + name);
 		endtext = tag->getString("endtext", "End of " + name);
-		intronumeric = tag->getInt("intronumeric", RPL_RULESTART, 0, 999);
-		textnumeric = tag->getInt("numeric", RPL_RULES, 0, 999);
-		endnumeric = tag->getInt("endnumeric", RPL_RULESEND, 0, 999);
+		intronumeric = tag->getUInt("intronumeric", RPL_RULESTART, 0, 999);
+		textnumeric = tag->getUInt("numeric", RPL_RULES, 0, 999);
+		endnumeric = tag->getUInt("endnumeric", RPL_RULESEND, 0, 999);
 		std::string smethod = tag->getString("method");
 
 		method = SF_NUMERIC;
@@ -82,8 +92,7 @@ class CommandShowFile : public Command
 			method = SF_NOTICE;
 
 		contents = filecontents;
-		if (tag->getBool("colors"))
-			InspIRCd::ProcessColors(contents);
+		InspIRCd::ProcessColors(contents);
 	}
 };