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 6ce1cecc5445d7e8cfb90acadd2adce0e3678dae..135e072b138e1346036a4f7d164c4638b4943654 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -51,21 +51,21 @@ public:
                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 ";
@@ -87,14 +87,14 @@ 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);
        }