Change type of log messages to MODNAME in several modules

[user/henk/code/inspircd.git] / src / modules / m_showfile.cpp

diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index c42877eef2fab9943a14d30d0b9dd1312fc1f9cd..57c501e909c7e5704eda3ccdbde37d496cb45b33 100644 (file)
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -44,23 +44,24 @@ class CommandShowFile : public Command
 
        CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
-               const std::string& sn = ServerInstance->Config->ServerName;
                if (method == SF_NUMERIC)
                {
                        if (!introtext.empty())
-                               user->SendText(":%s %03d %s :%s %s", sn.c_str(), intronumeric, user->nick.c_str(), sn.c_str(), introtext.c_str());
+                               user->WriteRemoteNumeric(intronumeric, introtext);
 
                        for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
-                               user->SendText(":%s %03d %s :- %s", sn.c_str(), textnumeric, user->nick.c_str(), i->c_str());
+                               user->WriteRemoteNumeric(textnumeric, InspIRCd::Format("- %s", i->c_str()));
 
-                       user->SendText(":%s %03d %s :%s", sn.c_str(), endnumeric, user->nick.c_str(), endtext.c_str());
+                       user->WriteRemoteNumeric(endnumeric, endtext.c_str());
                }
                else
                {
                        const char* msgcmd = (method == SF_MSG ? "PRIVMSG" : "NOTICE");
-                       std::string header = InspIRCd::Format(":%s %s %s :", sn.c_str(), msgcmd, user->nick.c_str());
                        for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
-                               user->SendText(header + *i);
+                       {
+                               const std::string& line = *i;
+                               user->WriteCommand(msgcmd, ":" + line);
+                       }
                }
                return CMD_SUCCESS;
        }
@@ -104,7 +105,7 @@ class ModuleShowFile : public Module
                FileReader reader(file);
 
                CommandShowFile* sfcmd;
-               Command* handler = ServerInstance->Parser->GetHandler(cmdname);
+               Command* handler = ServerInstance->Parser.GetHandler(cmdname);
                if (handler)
                {
                        // Command exists, check if it is ours
@@ -113,7 +114,7 @@ class ModuleShowFile : public Module
 
                        // This is our command, make sure we don't have the same entry twice
                        sfcmd = static_cast<CommandShowFile*>(handler);
-                       if (std::find(newcmds.begin(), newcmds.end(), sfcmd) != newcmds.end())
+                       if (stdalgo::isin(newcmds, sfcmd))
                                throw ModuleException("Command " + cmdname + " is already used in a <showfile> tag");
                }
                else