Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 1530a85e0019bedb2ec36fcf06428536e3937d9f..2006936992aa333723efa750548e38acd964030a 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -42,12 +42,15 @@ class ModuleBlockCAPS : public Module
 public:
 
        ModuleBlockCAPS() : bc(this)
+       {
+       }
+
+       void init()
        {
                OnRehash(NULL);
-               if (!ServerInstance->Modes->AddMode(&bc))
-                       throw ModuleException("Could not add new modes!");
+               ServerInstance->Modules->AddService(bc);
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual void On005Numeric(std::string &output)
@@ -109,12 +112,10 @@ public:
 
        void ReadConf()
        {
-               ConfigReader Conf;
-               percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
-               minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true);
-               std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0);
-               if (hmap.empty())
-                       hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+               ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
+               percent = tag->getInt("percent", 100);
+               minlen = tag->getInt("minlen", 1);
+               std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
                memset(capsmap, 0, sizeof(capsmap));
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
                        capsmap[(unsigned char)*n] = 1;