Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 6884cd4476aa8d82713eb269eb9f1244369a0cc7..e833af282cf9f63807bd18dd7f5f4fe0753c0f48 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.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
@@ -22,6 +26,17 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // From UnrealIRCd.
+       ERR_NOOPERMOTD = 425,
+
+       // From ircd-ratbox.
+       RPL_OMOTDSTART = 720,
+       RPL_OMOTD = 721,
+       RPL_ENDOFOMOTD = 722
+};
+
 /** Handle /OPERMOTD
  */
 class CommandOpermotd : public Command
@@ -31,39 +46,41 @@ class CommandOpermotd : public Command
 
        CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0, 1)
        {
-               flags_needed = 'o'; syntax = "[<servername>]";
+               flags_needed = 'o';
+               syntax = "[<servername>]";
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName))
-                       ShowOperMOTD(user);
+               if ((parameters.empty()) || (irc::equals(parameters[0], ServerInstance->Config->ServerName)))
+                       ShowOperMOTD(user, true);
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[0]);
                return ROUTE_LOCALONLY;
        }
 
-       void ShowOperMOTD(User* user)
+       void ShowOperMOTD(User* user, bool show_missing)
        {
                if (opermotd.empty())
                {
-                       user->WriteRemoteNumeric(455, "OPERMOTD file is missing");
+                       if (show_missing)
+                               user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing.");
                        return;
                }
 
-               user->WriteRemoteNumeric(RPL_MOTDSTART, "- IRC Operators Message of the Day");
+               user->WriteRemoteNumeric(RPL_OMOTDSTART, "Server operators message of the day");
 
                for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
                {
-                       user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
+                       user->WriteRemoteNumeric(RPL_OMOTD, InspIRCd::Format(" %s", i->c_str()));
                }
 
-               user->WriteRemoteNumeric(RPL_ENDOFMOTD, "- End of OPERMOTD");
+               user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "End of OPERMOTD");
        }
 };
 
@@ -81,13 +98,13 @@ class ModuleOpermotd : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
+               return Version("Adds the /OPERMOTD command which adds a special message of the day for server operators.", VF_VENDOR | VF_OPTCOMMON);
        }
 
        void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
        {
                if (onoper && IS_LOCAL(user))
-                       cmd.ShowOperMOTD(user);
+                       cmd.ShowOperMOTD(user, false);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -98,7 +115,7 @@ class ModuleOpermotd : public Module
 
                try
                {
-                       FileReader reader(conf->getString("file", "opermotd"));
+                       FileReader reader(conf->getString("file", "opermotd", 1));
                        cmd.opermotd = reader.GetVector();
                        InspIRCd::ProcessColors(cmd.opermotd);
                }