X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_list.cpp;h=1e994965b211af2961435a0f007e70f552aa8d9a;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=ab073b9e81194c31b40f53febc474e0c218076e3;hpb=11554b8626d8b421cc9cf2c6f6cc3fe2467e0441;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index ab073b9e8..1e994965b 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h"
-#include "users.h"
 #include "inspircd.h"
 #include "commands/cmd_list.h"
 #include "wildcard.h"
@@ -56,19 +54,22 @@ CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
 		if (too_many || too_few)
 			continue;
 
-		if (pcnt && (!match(i->second->name, parameters[0]) || (*i->second->topic && !match(i->second->topic, parameters[0]))))
-			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))
 		{
 			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)
@@ -80,3 +81,4 @@ CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
 
 	return CMD_SUCCESS;
 }
+