Change allocation of commands/modes

[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 15946cd1f2440b0120ca43fe283cc71a23da5772..9caa73d9101f167738fa847da73d1950deb20b7b 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -49,7 +49,7 @@ class CommandOpermotd : public Command
                syntax = "[<servername>]";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User* user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User* user)
        {
                return ShowOperMOTD(user);
        }
@@ -58,7 +58,8 @@ class CommandOpermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-       CommandOpermotd* mycommand;
+       CommandOpermotd cmd;
+       bool onoper;
  public:
 
        void LoadOperMOTD()
@@ -72,15 +73,15 @@ class ModuleOpermotd : public Module
                        opermotd = NULL;
                }
                opermotd = new FileReader(ServerInstance, filename);
+               onoper = conf->ReadFlag("opermotd","onoper","yes",0);
                delete conf;
        }
-       
+
        ModuleOpermotd(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me)
        {
                opermotd = NULL;
-               mycommand = new CommandOpermotd(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
                opermotd = new FileReader(ServerInstance);
                LoadOperMOTD();
                Implementation eventlist[] = { I_OnRehash, I_OnOper };
@@ -93,16 +94,17 @@ class ModuleOpermotd : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
 
        virtual void OnOper(User* user, const std::string &opertype)
        {
-               ShowOperMOTD(user);
+               if (onoper)
+                       ShowOperMOTD(user);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                LoadOperMOTD();
        }