Dynamically determine the size of the eventlist[] passed to Attach()

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

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index e6585e524cc9d51050659789942eb1dada2e770f..67ea6bde785779e9b68e7255498d216f81760c34 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -23,14 +23,14 @@
  */
 
 
+/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
+
 #define _CRT_SECURE_NO_DEPRECATE
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
 #include "u_listmode.h"
 
-/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
-
 /** Handles channel mode +g
  */
 class ChanFilter : public ListModeBase
@@ -75,21 +75,24 @@ class ModuleChanFilter : public Module
 
        ModuleChanFilter()
                : cf(this)
+       {
+       }
+
+       void init()
        {
                if (!ServerInstance->Modes->AddMode(&cf))
                        throw ModuleException("Could not add new modes!");
 
                cf.DoImplements(this);
                Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
                OnRehash(NULL);
        }
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
+               hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask");
                cf.DoRehash();
        }
 
@@ -129,11 +132,6 @@ class ModuleChanFilter : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               cf.DoCleanup(target_type, item);
-       }
-
        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);