Merge pull request #1337 from SaberUK/master+merge

[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 fcd248b90a6c6cb1644f55dcae05755d6440caa7..f6cb5853cff984e1f3d24cd164e3d042009a72c2 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -22,14 +22,12 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
-
 /** Handle /OPERMOTD
  */
 class CommandOpermotd : public Command
 {
  public:
-       FileReader opermotd;
+       file_cache opermotd;
 
        CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0, 1)
        {
@@ -45,29 +43,27 @@ class CommandOpermotd : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               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.FileSize())
+               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(375, "- IRC Operators Message of the Day");
 
-               for (int i=0; i != opermotd.FileSize(); i++)
+               for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
                {
-                       std::string line = opermotd.GetLine(i);
-                       user->SendText(":%s 372 %s :- %s", servername.c_str(), user->nick.c_str(), line.c_str());
+                       user->WriteRemoteNumeric(372, InspIRCd::Format("- %s", i->c_str()));
                }
 
-               user->SendText(":%s 376 %s :- End of OPERMOTD", servername.c_str(), user->nick.c_str());
+               user->WriteRemoteNumeric(376, "- End of OPERMOTD");
        }
 };
 
@@ -78,36 +74,40 @@ class ModuleOpermotd : public Module
        bool onoper;
  public:
 
-       void LoadOperMOTD()
-       {
-               ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
-               cmd.opermotd.LoadFile(conf->getString("file","opermotd"));
-               onoper = conf->getBool("onoper", true);
-       }
-
        ModuleOpermotd()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               LoadOperMOTD();
-               Implementation eventlist[] = { I_OnRehash, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
        }
 
-       virtual void OnOper(User* user, const std::string &opertype)
+       void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
        {
                if (onoper && IS_LOCAL(user))
                        cmd.ShowOperMOTD(user);
        }
 
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               LoadOperMOTD();
+               cmd.opermotd.clear();
+               ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+               onoper = conf->getBool("onoper", true);
+
+               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);
        }
 };