Merge pull request #545 from SaberUK/master+logging-cleanup

[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..0e1fa945ffecfdd5ef391d71b6a431d592fc1692 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -39,28 +39,31 @@ class ModuleBlockCAPS : public Module
        int percent;
        unsigned int minlen;
        char capsmap[256];
-public:
 
+public:
        ModuleBlockCAPS() : bc(this)
+       {
+       }
+
+       void init() CXX11_OVERRIDE
        {
                OnRehash(NULL);
-               if (!ServerInstance->Modes->AddMode(&bc))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->Modules->AddService(bc);
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnRehash, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('B');
+               tokens["EXTBAN"].push_back('B');
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                ReadConf();
        }
 
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -102,39 +105,28 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-       }
-
        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;
                if (percent < 1 || percent > 100)
                {
-                       ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
+                       ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
                        percent = 100;
                }
                if (minlen < 1 || minlen > MAXBUF-1)
                {
-                       ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+                       ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
                        minlen = 1;
                }
        }
 
-       virtual ~ModuleBlockCAPS()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR);
        }