X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showfile.cpp;h=ba3dc60e1a995d359bebc237f03adea76437a576;hb=581d1d8fa0ef62e20409543570390613c78e6f5b;hp=99c54514007fcd615d1c39556e3e2d38b741d5a7;hpb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 99c545140..ba3dc60e1 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -55,13 +56,14 @@ class CommandShowFile : public Command
 	{
 		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(textnumeric, InspIRCd::Format(" %s", i->c_str()));
 
-			user->WriteRemoteNumeric(endnumeric, endtext.c_str());
+			if (!endtext.empty() && endnumeric)
+				user->WriteRemoteNumeric(endnumeric, endtext.c_str());
 		}
 		else if (IS_LOCAL(user))
 		{
@@ -172,7 +174,7 @@ class ModuleShowFile : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for showing text files to users", VF_VENDOR);
+		return Version("Adds support for showing the contents of files to users when they execute a command.", VF_VENDOR);
 	}
 };