X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=21afcabad0b9f9f730b86c67af4d0d51961ec825;hb=1db0e984be491125d8f954aa22f17cad1d4c453f;hp=6b88a5e166ad5a4b03dea0938461d10005f93aef;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 6b88a5e16..21afcabad 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -22,55 +22,28 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
-
-class AuditoriumMode : public ModeHandler
+class AuditoriumMode : public SimpleChannelModeHandler
 {
  public:
-	AuditoriumMode(Module* Creator) : ModeHandler(Creator, "auditorium", 'u', PARAM_NONE, MODETYPE_CHANNEL)
+	AuditoriumMode(Module* Creator) : SimpleChannelModeHandler(Creator, "auditorium", 'u')
 	{
 		levelrequired = OP_VALUE;
 	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		if (channel->IsModeSet(this) == adding)
-			return MODEACTION_DENY;
-		channel->SetMode(this, adding);
-		return MODEACTION_ALLOW;
-	}
 };
 
 class ModuleAuditorium : public Module
 {
- private:
 	AuditoriumMode aum;
 	bool OpsVisible;
 	bool OpsCanSee;
 	bool OperCanSee;
+
  public:
 	ModuleAuditorium() : aum(this)
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(aum);
-
-		OnRehash(NULL);
-
-		Implementation eventlist[] = {
-			I_OnUserJoin, I_OnUserPart, I_OnUserKick,
-			I_OnBuildNeighborList, I_OnNamesListItem, I_OnSendWhoLine,
-			I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 7);
-	}
-
-	~ModuleAuditorium()
-	{
-	}
-
-	void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium");
 		OpsVisible = tag->getBool("opvisible");
@@ -78,7 +51,7 @@ class ModuleAuditorium : public Module
 		OperCanSee = tag->getBool("opercansee", true);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR);
 	}
@@ -112,7 +85,7 @@ class ModuleAuditorium : public Module
 		return false;
 	}
 
-	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
 	{
 		// Some module already hid this from being displayed, don't bother
 		if (nick.empty())
@@ -141,34 +114,36 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE
 	{
 		BuildExcept(memb, excepts);
 	}
 
-	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
+	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE
 	{
 		BuildExcept(memb, excepts);
 	}
 
-	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
+	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE
 	{
 		BuildExcept(memb, excepts);
 	}
 
-	void OnBuildNeighborList(User* source, UserChanList &include, std::map<User*,bool> &exception)
+	void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) CXX11_OVERRIDE
 	{
-		UCListIter i = include.begin();
-		while (i != include.end())
+		for (IncludeChanList::iterator i = include.begin(); i != include.end(); )
 		{
-			Channel* c = *i++;
-			Membership* memb = c->GetUser(source);
-			if (!memb || IsVisible(memb))
+			Membership* memb = *i;
+			if (IsVisible(memb))
+			{
+				++i;
 				continue;
+			}
+
 			// this channel should not be considered when listing my neighbors
-			include.erase(c);
+			i = include.erase(i);
 			// however, that might hide me from ops that can see me...
-			const UserMembList* users = c->GetUsers();
+			const UserMembList* users = memb->chan->GetUsers();
 			for(UserMembCIter j = users->begin(); j != users->end(); j++)
 			{
 				if (IS_LOCAL(j->first) && CanSee(j->first, memb))
@@ -177,9 +152,8 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Channel* channel, std::string& line) CXX11_OVERRIDE
 	{
-		Channel* channel = ServerInstance->FindChan(params[0]);
 		if (!channel)
 			return;
 		Membership* memb = channel->GetUser(user);