From 86775e2e98f55b3b88befe2daff0ca23f02f3155 Mon Sep 17 00:00:00 2001 From: danieldg Date: Wed, 2 Sep 2009 00:49:36 +0000 Subject: ModResult conversion: Change return type of all module functions git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11634 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_nonotice.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules/m_nonotice.cpp') diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp index 6d17bc85d..72426646f 100644 --- 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) { // 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() -- cgit v1.2.3