Attempt to revert r11734

[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 6b6030bd8e9e468767f6ff118c404f5001a73229..135e072b138e1346036a4f7d164c4638b4943654 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,26 +21,22 @@
 class BlockCaps : public SimpleChannelModeHandler
 {
  public:
-       BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { }
+       BlockCaps(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'B') { }
 };
 
 class ModuleBlockCAPS : public Module
 {
-       BlockCaps* bc;
+       BlockCaps bc;
        int percent;
        unsigned int minlen;
        char capsmap[256];
 public:
 
-       ModuleBlockCAPS(InspIRCd* Me) : Module(Me)
+       ModuleBlockCAPS(InspIRCd* Me) : Module(Me), bc(Me, 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;
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetStatus(user) == STATUS_OP)
+                       if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetPrefixValue(user) == OP_VALUE)
                        {
-                               return 0;
+                               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 ";
@@ -90,15 +86,15 @@ public:
                                }
                                if ( ((caps*100)/(int)text.length()) >= percent )
                                {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick.c_str(), c->name.c_str(), percent, minlen);
-                                       return 1;
+                                       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 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);
        }
@@ -128,8 +124,7 @@ public:
 
        virtual ~ModuleBlockCAPS()
        {
-               ServerInstance->Modes->DelMode(bc);
-               delete bc;
+               ServerInstance->Modes->DelMode(&bc);
        }
 
        virtual Version GetVersion()