m_nationalchars Rebuild core hashmaps when the national_case_insensitive_map changes

[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..989f97689d20c45f45aa41e8340520e52d5b2043 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -29,7 +29,7 @@
 class CommandOpermotd : public Command
 {
  public:
-       FileReader opermotd;
+       file_cache opermotd;
 
        CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0, 1)
        {
@@ -53,7 +53,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 +61,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,20 +77,17 @@ 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()
        {
-               ServerInstance->AddCommand(&cmd);
-               LoadOperMOTD();
+               ServerInstance->Modules->AddService(cmd);
+               OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual Version GetVersion()
@@ -104,7 +103,16 @@ class ModuleOpermotd : public Module
 
        virtual void OnRehash(User* user)
        {
-               LoadOperMOTD();
+               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));
+
+               if (conf->getBool("processcolors"))
+                       InspIRCd::ProcessColors(cmd.opermotd);
        }
 };