X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_list.cpp;h=388aead673f0b259cb31e05d124d2cbfb110ff78;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=7b17cfa7753fb4dbe8a9a047676cdf5d714712eb;hpb=aaf5226111f515f4baa68e95ea6a1db740828ac3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 7b17cfa77..388aead67 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -14,28 +14,10 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include "users.h"
 #include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "message.h"
 #include "commands.h"
-#include "inspstring.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
 #include "cmd_list.h"
 
 extern chan_hash chanlist;
@@ -46,13 +28,13 @@ void cmd_list::Handle (char **parameters, int pcnt, userrec *user)
 	for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
 	{
 		// if the channel is not private/secret, OR the user is on the channel anyway
-		if (((!(i->second->binarymodes & CM_PRIVATE)) && (!(i->second->binarymodes & CM_SECRET))) || (i->second->HasUser(user)))
+		bool n = i->second->HasUser(user);
+		if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
 		{
-			WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,usercount_i(i->second),chanmodes(i->second,i->second->HasUser(user)),i->second->topic);
+			long users = usercount(i->second);
+			if (users)
+				WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,chanmodes(i->second,n),i->second->topic);
 		}
 	}
 	WriteServ(user->fd,"323 %s :End of channel list.",user->nick);
 }
-
-
-