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

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 7b17cfa77..5ce458ab7 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -14,45 +14,50 @@
  * ---------------------------------------------------
  */
 
-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"
+#include "inspircd.h"
+#include "commands/cmd_list.h"
+#include "wildcard.h"
 
-extern chan_hash chanlist;
+/** Handle /LIST
+ */
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_list(Instance);
+}
 
-void cmd_list::Handle (char **parameters, int pcnt, userrec *user)
+CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	WriteServ(user->fd,"321 %s Channel :Users Name",user->nick);
-	for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
+	user->WriteServ("321 %s Channel :Users Name",user->nick);
+
+	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
+	if ((pcnt == 1) && (*parameters[0] == '<'))
+		pcnt = 0;
+
+	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]))
+			continue;
 		// 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]) && (!n))
+		{
+			long users = i->second->GetUserCounter();
+			if (users)
+				user->WriteServ("322 %s *",user->nick,i->second->name);
+		}
+		else
 		{
-			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);
+			if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
+			{
+				long users = i->second->GetUserCounter();
+				if (users)
+					user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+			}
 		}
 	}
-	WriteServ(user->fd,"323 %s :End of channel list.",user->nick);
-}
-
-
+	user->WriteServ("323 %s :End of channel list.",user->nick);
 
+	return CMD_SUCCESS;
+}