X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_list.cpp;h=1e994965b211af2961435a0f007e70f552aa8d9a;hb=19157777c5f977fddbcfdc8cdad78e12bf0d6bbb;hp=b1bb4417203bba41d203037406889dd4e77fe63b;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index b1bb44172..1e994965b 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -11,42 +11,65 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
 #include "inspircd.h"
 #include "commands/cmd_list.h"
 #include "wildcard.h"
 
 /** Handle /LIST
  */
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_list(Instance);
 }
 
 CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
 {
+	int minusers = 0, maxusers = 0;
+
 	user->WriteServ("321 %s Channel :Users Name",user->nick);
 
 	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
-	if ((pcnt == 1) && (*parameters[0] == '<'))
-		pcnt = 0;
+	if (pcnt == 1)
+	{
+		if (*parameters[0] == '<')
+		{
+			maxusers = atoi(parameters[0]+1);
+			pcnt = 0;
+		}
+		else if (*parameters[0] == '>')
+		{
+			minusers = atoi(parameters[0]+1);
+			pcnt = 0;
+		}
+	}
 
-	for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
+	for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
 	{
 		// attempt to match a glob pattern
-		if (pcnt && !match(i->second->name, parameters[0]))
+		long users = i->second->GetUserCounter();
+
+		bool too_few = (minusers && (users <= minusers));
+		bool too_many = (maxusers && (users >= maxusers));
+
+		if (too_many || too_few)
 			continue;
+
+		if (pcnt)
+		{
+			if (!match(i->second->name, parameters[0]) && !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->modes[CM_PRIVATE]) && (!n))
+		if ((i->second->IsModeSet('p')) && (!n))
 		{
-			long users = i->second->GetUserCounter();
 			if (users)
 				user->WriteServ("322 %s *",user->nick,i->second->name);
 		}
 		else
 		{
-			if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
+			if (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))
 			{
 				long users = i->second->GetUserCounter();
 				if (users)
@@ -58,3 +81,4 @@ CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
 
 	return CMD_SUCCESS;
 }
+