Replace [cC]olour with [cC]olor

[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..cbe4bc1faf1cfde7bb34594cac239f52976b18ba 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,16 +20,16 @@
 class BlockColor : public SimpleChannelModeHandler
 {
  public:
-       BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, 'c') { }
+       BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
 };
 
-class ModuleBlockColour : public Module
+class ModuleBlockColor : public Module
 {
        bool AllowChanOps;
        BlockColor bc;
  public:
 
-       ModuleBlockColour() : bc(this)
+       ModuleBlockColor() : bc(this)
        {
                if (!ServerInstance->Modes->AddMode(&bc))
                        throw ModuleException("Could not add new modes!");
@@ -47,11 +47,10 @@ class ModuleBlockColour : public Module
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
+                       ModResult res = ServerInstance->OnCheckExemption(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')))
                        {
@@ -65,7 +64,7 @@ class ModuleBlockColour : public Module
                                                case 21:
                                                case 22:
                                                case 31:
-                                                       user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name.c_str());
+                                                       user->WriteNumeric(404, "%s %s :Can't send colors to channel (+c set)",user->nick.c_str(), c->name.c_str());
                                                        return MOD_RES_DENY;
                                                break;
                                        }
@@ -80,15 +79,14 @@ class ModuleBlockColour : public Module
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
-       virtual ~ModuleBlockColour()
+       virtual ~ModuleBlockColor()
        {
-               ServerInstance->Modes->DelMode(&bc);
        }
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support for unreal-style channel mode +c",VF_VENDOR);
        }
 };
 
-MODULE_INIT(ModuleBlockColour)
+MODULE_INIT(ModuleBlockColor)