Merge pull request #1094 from SISheogorath/insp20+fixed-Override

[user/henk/code/inspircd.git] / src / modules / m_blockamsg.cpp

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index c570e0a714066fb1ffef750a97515528ba52cb4f..be861447f36effcab132852d2f8e32836fe45387 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -56,14 +56,17 @@ class ModuleBlockAmsg : public Module
 
  public:
        ModuleBlockAmsg() : blockamsg("blockamsg", this)
+       {
+       }
+
+       void init()
        {
                this->OnRehash(NULL);
-               ServerInstance->Extensions.Register(&blockamsg);
+               ServerInstance->Modules->AddService(blockamsg);
                Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-
        virtual ~ModuleBlockAmsg()
        {
        }
@@ -75,14 +78,9 @@ class ModuleBlockAmsg : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-
-               ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
-
-               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-                       ForgetDelay = -1;
-
-               std::string act = Conf.ReadValue("blockamsg", "action", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
+               ForgetDelay = tag->getInt("delay", -1);
+               std::string act = tag->getString("action");
 
                if(act == "notice")
                        action = IBLOCK_NOTICE;