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 6eb3a054021a00df798aa6d782206e0a1d82e9a2..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
@@ -43,9 +43,9 @@ CmdResult ShowOperMOTD(User* user)
 class CommandOpermotd : public Command
 {
  public:
-       CommandOpermotd (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"OPERMOTD", "o", 0)
+       CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
        {
-               syntax = "[<servername>]";
+               flags_needed = 'o'; syntax = "[<servername>]";
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User* user)
@@ -63,25 +63,17 @@ class ModuleOpermotd : public Module
 
        void LoadOperMOTD()
        {
-               ConfigReader* conf = new ConfigReader(ServerInstance);
-               std::string filename;
-               filename = conf->ReadValue("opermotd","file",0);
-               if (opermotd)
-               {
-                       delete opermotd;
-                       opermotd = NULL;
-               }
-               opermotd = new FileReader(ServerInstance, 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(InspIRCd* Me)
-               : Module(Me), cmd(Me, this)
+       ModuleOpermotd()
+               : cmd(this)
        {
                opermotd = NULL;
                ServerInstance->AddCommand(&cmd);
-               opermotd = new FileReader(ServerInstance);
+               opermotd = new FileReader;
                LoadOperMOTD();
                Implementation eventlist[] = { I_OnRehash, I_OnOper };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -89,14 +81,15 @@ class ModuleOpermotd : public Module
 
        virtual ~ModuleOpermotd()
        {
+               delete opermotd;
+               opermotd = NULL;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               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)