Move static map of extensions into ServerInstance, add const-correctness

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 1c7cd8c52c331a39805fbed509f70436da4fd85c..73bfb76069c32ac4213877282908c9eb09f3e697 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -20,7 +20,7 @@
 class BlockColor : public SimpleChannelModeHandler
 {
  public:
-       BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, 'c') { }
+       BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
 };
 
 class ModuleBlockColour : public Module
@@ -47,11 +47,11 @@ class ModuleBlockColour : public Module
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
+                       ModResult res;
+                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"blockcolor"));
 
-                       if (CHANOPS_EXEMPT('c') && c->GetPrefixValue(user) == OP_VALUE)
-                       {
+                       if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
-                       }
 
                        if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet('c')))
                        {
@@ -82,7 +82,6 @@ class ModuleBlockColour : public Module
 
        virtual ~ModuleBlockColour()
        {
-               ServerInstance->Modes->DelMode(&bc);
        }
 
        virtual Version GetVersion()