X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_auditorium.cpp;h=7acbd2fff856a11e0ea081dbb60faa17eb9bc553;hb=451e687f681ccab5c02a8de1a7d59b324efbfe08;hp=70f17e9080d3a2af52acaeb757bf5473970f0ecf;hpb=04ece67c3d8534f74a3d75ec77378cb57a9c044e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 70f17e908..7acbd2fff 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -21,25 +21,29 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
 class AuditoriumMode : public SimpleChannelModeHandler
 {
  public:
 	AuditoriumMode(Module* Creator) : SimpleChannelModeHandler(Creator, "auditorium", 'u')
 	{
-		levelrequired = OP_VALUE;
+		ranktoset = ranktounset = OP_VALUE;
 	}
 };
 
 class ModuleAuditorium : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	AuditoriumMode aum;
 	bool OpsVisible;
 	bool OpsCanSee;
 	bool OperCanSee;
 
  public:
-	ModuleAuditorium() : aum(this)
+	ModuleAuditorium()
+		: exemptionprov(this)
+		, aum(this)
 	{
 	}
 
@@ -62,7 +66,7 @@ class ModuleAuditorium : public Module
 		if (!memb->chan->IsModeSet(&aum))
 			return true;
 
-		ModResult res = ServerInstance->OnCheckExemption(memb->user, memb->chan, "auditorium-vis");
+		ModResult res = CheckExemption::Call(exemptionprov, memb->user, memb->chan, "auditorium-vis");
 		return res.check(OpsVisible && memb->getRank() >= OP_VALUE);
 	}
 
@@ -78,7 +82,7 @@ class ModuleAuditorium : public Module
 			return true;
 
 		// Can you see the list by permission?
-		ModResult res = ServerInstance->OnCheckExemption(issuer,memb->chan,"auditorium-see");
+		ModResult res = CheckExemption::Call(exemptionprov, issuer, memb->chan, "auditorium-see");
 		if (res.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE))
 			return true;
 
@@ -104,7 +108,7 @@ class ModuleAuditorium : public Module
 			return;
 
 		const Channel::MemberMap& users = memb->chan->GetUsers();
-		for (UserMembCIter i = users.begin(); i != users.end(); ++i)
+		for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
 		{
 			if (IS_LOCAL(i->first) && !CanSee(i->first, memb))
 				excepts.insert(i->first);
@@ -141,7 +145,7 @@ class ModuleAuditorium : public Module
 			i = include.erase(i);
 			// however, that might hide me from ops that can see me...
 			const Channel::MemberMap& users = memb->chan->GetUsers();
-			for(UserMembCIter j = users.begin(); j != users.end(); ++j)
+			for(Channel::MemberMap::const_iterator j = users.begin(); j != users.end(); ++j)
 			{
 				if (IS_LOCAL(j->first) && CanSee(j->first, memb))
 					exception[j->first] = true;
@@ -149,15 +153,15 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
 		if (!memb)
-			return;
+			return MOD_RES_PASSTHRU;
 		if (IsVisible(memb))
-			return;
+			return MOD_RES_PASSTHRU;
 		if (CanSee(source, memb))
-			return;
-		line.clear();
+			return MOD_RES_PASSTHRU;
+		return MOD_RES_DENY;
 	}
 };