m_exemptchanops by jackmcbarn - channel mode +X to allow per-channel setting

[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 4c1939ca5cc92483ca21eab986705cf11068878b..e21e1da888ad88f772c8fa9ee3454187816f9934 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -16,31 +16,27 @@
 /* $ModDesc: Provides support to block all-CAPS channel messages and notices */
 
 
-/** Handles the +P channel mode
+/** Handles the +B channel mode
  */
 class BlockCaps : public SimpleChannelModeHandler
 {
  public:
-       BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { }
+       BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { }
 };
 
 class ModuleBlockCAPS : public Module
 {
-       BlockCaps* bc;
+       BlockCaps bc;
        int percent;
        unsigned int minlen;
        char capsmap[256];
 public:
 
-       ModuleBlockCAPS(InspIRCd* Me) : Module(Me)
+       ModuleBlockCAPS() : bc(this)
        {
-               OnRehash(NULL,"");
-               bc = new BlockCaps(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(bc))
-               {
-                       delete bc;
+               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);
        }
@@ -50,26 +46,26 @@ public:
                ServerInstance->AddExtBanChar('B');
        }
 
-       virtual void OnRehash(User* user, const std::string &param)
+       virtual void OnRehash(User* user)
        {
                ReadConf();
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        if ((!IS_LOCAL(user)) || (text.length() < minlen))
-                               return 0;
+                               return MOD_RES_PASSTHRU;
 
                        Channel* c = (Channel*)dest;
+                       ModResult res;
+                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (c->GetUser(user),c,"blockcaps"));
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP)
-                       {
-                               return 0;
-                       }
+                       if (res == MOD_RES_ALLOW)
+                               return MOD_RES_PASSTHRU;
 
-                       if (c->IsModeSet('B') || c->GetExtBanStatus(user, 'B') < 0)
+                       if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet('B')))
                        {
                                int caps = 0;
                                const char* actstr = "\1ACTION ";
@@ -91,21 +87,21 @@ public:
                                if ( ((caps*100)/(int)text.length()) >= percent )
                                {
                                        user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), c->name.c_str(), percent, minlen);
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       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(ServerInstance);
+               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);
@@ -128,13 +124,11 @@ public:
 
        virtual ~ModuleBlockCAPS()
        {
-               ServerInstance->Modes->DelMode(bc);
-               delete bc;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Provides support to block all-CAPS channel messages and notices", VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };