httpd connection close fixes (these need to be backported to 1.1 at some point?)...

[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 ef3ae98c45952acb36d0a9fab6d99d5228adcda0..d834a6029887a8086e95dd61e611f64c3c2e5b96 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-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -40,16 +40,16 @@ CmdResult ShowOperMOTD(User* user)
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public Command
+class CommandOpermotd : public Command
 {
  public:
-       cmd_opermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
+       CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
        {
                this->source = "m_opermotd.so";
                syntax = "[<servername>]";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User* user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User* user)
        {
                return ShowOperMOTD(user);
        }
@@ -58,7 +58,7 @@ class cmd_opermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-       cmd_opermotd* mycommand;
+       CommandOpermotd* mycommand;
  public:
 
        void LoadOperMOTD()
@@ -72,17 +72,19 @@ class ModuleOpermotd : public Module
                        opermotd = NULL;
                }
                opermotd = new FileReader(ServerInstance, filename);
-               DELETE(conf);
+               delete conf;
        }
        
        ModuleOpermotd(InspIRCd* Me)
                : Module(Me)
        {
                opermotd = NULL;
-               mycommand = new cmd_opermotd(ServerInstance);
+               mycommand = new CommandOpermotd(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                opermotd = new FileReader(ServerInstance);
                LoadOperMOTD();
+               Implementation eventlist[] = { I_OnRehash, I_OnOper };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleOpermotd()
@@ -91,13 +93,9 @@ class ModuleOpermotd : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnOper] = 1;
-       }
 
        virtual void OnOper(User* user, const std::string &opertype)
        {