GnuTLS: Send SSL client certificate when requested

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 6d17bc85df04a453b4117d9f017dfb218082f9b4..fab52ca2e1426f5cea8a0b8266516364e850e456 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -40,31 +40,31 @@ class ModuleNoNotice : public Module
                ServerInstance->AddExtBanChar('T');
        }
 
-       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)
        {
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
-                       if (c->IsModeSet('T') || c->GetExtBanStatus(user, 'T') < 0)
+                       if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
                        {
                                if (ServerInstance->ULine(user->server))
                                {
                                        // ulines are exempt.
-                                       return 0;
+                                       return MOD_RES_PASSTHRU;
                                }
-                               else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
+                               else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetPrefixValue(user) == OP_VALUE)
                                {
                                        // channel ops are exempt if set in conf.
-                                       return 0;
+                                       return MOD_RES_PASSTHRU;
                                }
                                else
                                {
                                        user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleNoNotice()