summaryrefslogtreecommitdiff
path: root/src/modules/m_opermotd.cpp
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-02-02 19:03:07 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-02-02 19:03:07 +0000
commit9d4004e8d477232c143830508a7a6e41fd2d31b7 (patch)
tree6808c9d90e272300062ce76eae5f7b7b445166a1 /src/modules/m_opermotd.cpp
parentf2256deeefe9a9f57f6f6b902604c01138ad16cc (diff)
Allow opermotd to specify its file in <files> without also requiring an <opermotd> block
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12355 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_opermotd.cpp')
-rw-r--r--src/modules/m_opermotd.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index be832e289..7b4584db9 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -63,12 +63,9 @@ class ModuleOpermotd : public Module
void LoadOperMOTD()
{
- ConfigReader conf;
- std::string filename;
- filename = conf.ReadValue("opermotd","file",0);
- delete opermotd;
- opermotd = new FileReader(filename);
- onoper = conf.ReadFlag("opermotd","onoper","yes",0);
+ ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+ opermotd->LoadFile(conf->getString("file","opermotd"));
+ onoper = conf->getBool("onoper", true);
}
ModuleOpermotd()
@@ -84,6 +81,8 @@ class ModuleOpermotd : public Module
virtual ~ModuleOpermotd()
{
+ delete opermotd;
+ opermotd = NULL;
}
virtual Version GetVersion()
@@ -91,7 +90,6 @@ class ModuleOpermotd : public Module
return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
}
-
virtual void OnOper(User* user, const std::string &opertype)
{
if (onoper)