X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=2a8edb9d49f1a464eb26fe597817073b44b1ba18;hb=91c34d4e971dcc9370d205ff6d8189cd92f1d556;hp=0e5c9231028e7bf4606cf0357cad5e8b018ad06a;hpb=dc0f193e9514e7ae6e9c6a05c4208f1dbd3aa4bc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 0e5c92310..2a8edb9d4 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
@@ -50,8 +59,11 @@ class ModuleAuditorium : public Module
 
 		OnRehash(NULL);
 
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = {
+			I_OnUserJoin, I_OnUserPart, I_OnUserKick,
+			I_OnBuildNeighborList, I_OnNamesListItem, I_OnSendWhoLine,
+			I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	~ModuleAuditorium()
@@ -150,13 +162,33 @@ class ModuleAuditorium : public Module
 		while (i != include.end())
 		{
 			Channel* c = *i++;
-			Membership* memb = c->GetUser(source); // will be non-null
-			if (IsVisible(memb))
+			Membership* memb = c->GetUser(source);
+			if (!memb || IsVisible(memb))
 				continue;
-			// TODO this doesn't take can-see into account
+			// this channel should not be considered when listing my neighbors
 			include.erase(c);
+			// however, that might hide me from ops that can see me...
+			const UserMembList* users = c->GetUsers();
+			for(UserMembCIter j = users->begin(); j != users->end(); j++)
+			{
+				if (IS_LOCAL(j->first) && CanSee(j->first, memb))
+					exception[j->first] = true;
+			}
 		}
 	}
+
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+	{
+		Channel* channel = ServerInstance->FindChan(params[0]);
+		if (!channel)
+			return;
+		Membership* memb = channel->GetUser(user);
+		if ((!memb) || (IsVisible(memb)))
+			return;
+		if (CanSee(source, memb))
+			return;
+		line.clear();
+	}
 };
 
 MODULE_INIT(ModuleAuditorium)