m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

[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 5c107b6b190fbefd6843423675a043c14e8810c3..1be81e641823e6a5f8e9079b8df34cd2f13590e1 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)
        {
@@ -53,7 +51,7 @@ class CommandOpermotd : public Command
        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());
                        return;
@@ -61,8 +59,10 @@ class CommandOpermotd : public Command
 
                user->SendText(":%s 375 %s :- IRC Operators Message of the Day", servername.c_str(), user->nick.c_str());
 
-               for (int i=0; i != opermotd.FileSize(); i++)
-                       user->SendText(":%s 372 %s :- %s", servername.c_str(), user->nick.c_str(), opermotd.GetLine(i).c_str());
+               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->SendText(":%s 376 %s :- End of OPERMOTD", servername.c_str(), user->nick.c_str());
        }
@@ -75,36 +75,46 @@ class ModuleOpermotd : public Module
        bool onoper;
  public:
 
-       void LoadOperMOTD()
+       ModuleOpermotd()
+               : cmd(this)
        {
-               ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
-               cmd.opermotd.LoadFile(conf->getString("file","opermotd"));
-               onoper = conf->getBool("onoper", true);
        }
 
-       ModuleOpermotd()
-               : cmd(this)
+       void init() CXX11_OVERRIDE
        {
-               ServerInstance->AddCommand(&cmd);
-               LoadOperMOTD();
-               Implementation eventlist[] = { I_OnRehash, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->AddService(cmd);
+               OnRehash(NULL);
        }
 
-       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 OnRehash(User* user) 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);
        }
 };