Remove InspIRCd* parameters and fields

[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 d7930b74a21627b68c2c96a2decc0fa83d6cd19b..411cd42c86cd23ceb9a65eb809f7f98e3bebaa7e 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.
@@ -35,7 +35,7 @@ CmdResult ShowOperMOTD(User* user)
        user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
        /* don't route me */
-       return CMD_LOCALONLY;
+       return CMD_SUCCESS;
 }
 
 /** Handle /OPERMOTD
@@ -43,13 +43,12 @@ CmdResult ShowOperMOTD(User* user)
 class CommandOpermotd : public Command
 {
  public:
-       CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
+       CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
        {
-               this->source = "m_opermotd.so";
-               syntax = "[<servername>]";
+               flags_needed = 'o'; 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,12 +57,13 @@ class CommandOpermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-       CommandOpermotd* mycommand;
+       CommandOpermotd cmd;
+       bool onoper;
  public:
 
        void LoadOperMOTD()
        {
-               ConfigReader* conf = new ConfigReader(ServerInstance);
+               ConfigReader* conf = new ConfigReader;
                std::string filename;
                filename = conf->ReadValue("opermotd","file",0);
                if (opermotd)
@@ -71,17 +71,17 @@ class ModuleOpermotd : public Module
                        delete opermotd;
                        opermotd = NULL;
                }
-               opermotd = new FileReader(ServerInstance, filename);
+               opermotd = new FileReader(filename);
+               onoper = conf->ReadFlag("opermotd","onoper","yes",0);
                delete conf;
        }
-       
-       ModuleOpermotd(InspIRCd* Me)
-               : Module(Me)
+
+       ModuleOpermotd()
+               : cmd(this)
        {
                opermotd = NULL;
-               mycommand = new CommandOpermotd(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-               opermotd = new FileReader(ServerInstance);
+               ServerInstance->AddCommand(&cmd);
+               opermotd = new FileReader;
                LoadOperMOTD();
                Implementation eventlist[] = { I_OnRehash, I_OnOper };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -93,16 +93,17 @@ class ModuleOpermotd : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Shows a message to opers after oper-up, adds /opermotd", 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();
        }