Implement channels/auspex priv for /names and /list.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10666 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 6 insertions, 3 deletions

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index f0e1a143e..9ecbea6a6 100644
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -58,15 +58,18 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 		}
 
 		// if the channel is not private/secret, OR the user is on the channel anyway
-		bool n = (i->second->HasUser(user) || IS_OPER(user));
-		if (!IS_OPER(user) && (i->second->IsModeSet('p')) && (!n))
+		bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex"));
+
+		if (!n && i->second->IsModeSet('p'))
 		{
+			/* Channel is +p and user is outside/not privileged */
 			user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
 		}
 		else
 		{
-			if (IS_OPER(user) || (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n)))
+			if (n || !i->second->IsModeSet('s'))
 			{
+				/* User is in the channel/privileged, channel is not +s */
 				user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick.c_str(),i->second->name.c_str(),users,i->second->ChanModes(n),i->second->topic.c_str());
 			}
 		}