Prevent setting mode -H if already unset, bug #74

[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 a9f7b3b0742aa5e61bd996b3a8cd0da3936e9aa6..7b4584db9c52fdd0a0c05553f49a875809f94017 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -63,17 +63,9 @@ class ModuleOpermotd : public Module
 
        void LoadOperMOTD()
        {
-               ConfigReader* conf = new ConfigReader;
-               std::string filename;
-               filename = conf->ReadValue("opermotd","file",0);
-               if (opermotd)
-               {
-                       delete opermotd;
-                       opermotd = NULL;
-               }
-               opermotd = new FileReader(filename);
-               onoper = conf->ReadFlag("opermotd","onoper","yes",0);
-               delete conf;
+               ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+               opermotd->LoadFile(conf->getString("file","opermotd"));
+               onoper = conf->getBool("onoper", true);
        }
 
        ModuleOpermotd()
@@ -89,6 +81,8 @@ class ModuleOpermotd : public Module
 
        virtual ~ModuleOpermotd()
        {
+               delete opermotd;
+               opermotd = NULL;
        }
 
        virtual Version GetVersion()
@@ -96,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)