X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_list.cpp;h=9d65b4165392fc9022fdf515e950d21d41396d17;hb=7b6eae36661bc798f69b22393b85a4f06d533cf6;hp=2c7971edd33acea5f51b577a1492739a6e304d50;hpb=58385dd458e927994957b6d603f7f9da3fc52e14;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index 2c7971edd..9d65b4165 100644
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -13,7 +13,6 @@
 
 #include "inspircd.h"
 #include "commands/cmd_list.h"
-#include "wildcard.h"
 
 /** Handle /LIST
  */
@@ -22,24 +21,22 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandList(Instance);
 }
 
-CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	int minusers = 0, maxusers = 0;
 
-	user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+	user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
 	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
-	if (pcnt == 1)
+	if (parameters.size() == 1)
 	{
-		if (*parameters[0] == '<')
+		if (parameters[0][0] == '<')
 		{
-			maxusers = atoi(parameters[0]+1);
-			pcnt = 0;
+			maxusers = atoi((parameters[0].c_str())+1);
 		}
-		else if (*parameters[0] == '>')
+		else if (parameters[0][0] == '>')
 		{
-			minusers = atoi(parameters[0]+1);
-			pcnt = 0;
+			minusers = atoi((parameters[0].c_str())+1);
 		}
 	}
 
@@ -54,27 +51,30 @@ CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *us
 		if (too_many || too_few)
 			continue;
 
-		if (pcnt)
+		if (parameters.size() && (parameters[0][0] != '<' && parameters[0][0] != '>'))
 		{
-			if (!match(i->second->name, parameters[0]) && !match(i->second->topic, parameters[0]))
+			if (!InspIRCd::Match(i->second->name, parameters[0]) && !InspIRCd::Match(i->second->topic, parameters[0]))
 				continue;
 		}
 
 		// if the channel is not private/secret, OR the user is on the channel anyway
-		bool n = i->second->HasUser(user);
-		if ((i->second->IsModeSet('p')) && (!n))
+		bool n = (i->second->HasUser(user) || user->HasPrivPermission("channels/auspex"));
+
+		if (!n && i->second->IsModeSet('p'))
 		{
-			user->WriteNumeric(322, "%s *",user->nick);
+			/* Channel is +p and user is outside/not privileged */
+			user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
 		}
 		else
 		{
-			if (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))
+			if (n || !i->second->IsModeSet('s'))
 			{
-				user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+				/* 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());
 			}
 		}
 	}
-	user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+	user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
 
 	return CMD_SUCCESS;
 }