Add the override keyword in places that it is missing.

[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 b228dc8b771fb8795299e2ed45baed2d1fa238a0..30f2ce303a3f1c64b08746b22828464faa01462c 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -22,8 +22,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
-
 /** Handle /OPERMOTD
  */
 class CommandOpermotd : public Command
@@ -36,37 +34,36 @@ class CommandOpermotd : public Command
                flags_needed = 'o'; syntax = "[<servername>]";
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User* user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
                if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName))
                        ShowOperMOTD(user);
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
        {
-               if (!parameters.empty())
+               if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[0]);
                return ROUTE_LOCALONLY;
        }
 
        void ShowOperMOTD(User* user)
        {
-               const std::string& servername = ServerInstance->Config->ServerName;
                if (opermotd.empty())
                {
-                       user->SendText(":%s 455 %s :OPERMOTD file is missing", servername.c_str(), user->nick.c_str());
+                       user->WriteRemoteNumeric(455, "OPERMOTD file is missing");
                        return;
                }
 
-               user->SendText(":%s 375 %s :- IRC Operators Message of the Day", servername.c_str(), user->nick.c_str());
+               user->WriteRemoteNumeric(RPL_MOTDSTART, "- IRC Operators Message of the Day");
 
                for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
                {
-                       user->SendText(":%s 372 %s :- %s", servername.c_str(), user->nick.c_str(), i->c_str());
+                       user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
                }
 
-               user->SendText(":%s 376 %s :- End of OPERMOTD", servername.c_str(), user->nick.c_str());
+               user->WriteRemoteNumeric(RPL_ENDOFMOTD, "- End of OPERMOTD");
        }
 };
 
@@ -82,14 +79,6 @@ class ModuleOpermotd : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-               OnRehash(NULL);
-               Implementation eventlist[] = { I_OnRehash, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
@@ -101,15 +90,21 @@ class ModuleOpermotd : public Module
                        cmd.ShowOperMOTD(user);
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                cmd.opermotd.clear();
                ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
                onoper = conf->getBool("onoper", true);
 
-               FileReader f(conf->getString("file", "opermotd"));
-               for (int i=0, filesize = f.FileSize(); i < filesize; i++)
-                       cmd.opermotd.push_back(f.GetLine(i));
+               try
+               {
+                       FileReader reader(conf->getString("file", "opermotd"));
+                       cmd.opermotd = reader.GetVector();
+               }
+               catch (CoreException&)
+               {
+                       // Nothing happens here as we do the error handling in ShowOperMOTD.
+               }
 
                if (conf->getBool("processcolors"))
                        InspIRCd::ProcessColors(cmd.opermotd);