From 496d7583feadc34f0645f99eb2a992d4aa74d6c2 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Fri, 5 Mar 2010 14:32:48 -0600 Subject: Use OnChannelPermissionCheck for auditorium --- src/modules/m_auditorium.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/modules/m_auditorium.cpp') diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 0cd1e813b..ba392ae0e 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -78,8 +78,9 @@ class ModuleAuditorium : public Module if (!memb->chan->IsModeSet(&aum)) return true; - ModResult res = ServerInstance->OnCheckExemption(memb->user, memb->chan, "auditorium-vis"); - return res.check(OpsVisible && memb->getRank() >= OP_VALUE); + PermissionData vis("auditorium/visible"); + FOR_EACH_MOD(OnChannelPermissionCheck, (memb->user, memb->chan, vis)); + return vis.result.check(OpsVisible && memb->getRank() >= OP_VALUE); } /* Can they see this specific membership? */ @@ -94,11 +95,9 @@ class ModuleAuditorium : public Module return true; // Can you see the list by permission? - ModResult res = ServerInstance->OnCheckExemption(issuer,memb->chan,"auditorium-see"); - if (res.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE)) - return true; - - return false; + TargetedPermissionData vis("auditorium/see", memb->user); + FOR_EACH_MOD(OnChannelPermissionCheck, (issuer, memb->chan, vis)); + return vis.result.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE); } void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) -- cgit v1.3.1-10-gc9f91