X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_list.cpp;h=ed956e7f10ab178cb9b5ebc551c84d4df6a673c0;hb=a2b40829c116cd67d5f293404371eb132dcaa8e3;hp=46109e4d831c5234b186d643876796dc9408c0e3;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 46109e4d8..ed956e7f1 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -2,79 +2,84 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
+#include "inspircd.h"
+#include "commands/cmd_list.h"
 #include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_list.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
+/** Handle /LIST
+ */
+extern "C" DllExport 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++)
+	int minusers = 0, maxusers = 0;
+
+	user->WriteServ("321 %s Channel :Users Name",user->nick);
+
+	/* Work around mIRC suckyness. YOU SUCK, KHALED! */
+	if (pcnt == 1)
 	{
-		// 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))) || (has_channel(user,i->second)))
+		if (*parameters[0] == '<')
+		{
+			maxusers = atoi(parameters[0]+1);
+			pcnt = 0;
+		}
+		else if (*parameters[0] == '>')
 		{
-			WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,usercount_i(i->second),chanmodes(i->second),i->second->topic);
+			minusers = atoi(parameters[0]+1);
+			pcnt = 0;
 		}
 	}
-	WriteServ(user->fd,"323 %s :End of channel list.",user->nick);
-}
 
+	for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
+	{
+		// attempt to match a glob pattern
+		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 (users)
+				user->WriteServ("322 %s *",user->nick,i->second->name);
+		}
+		else
+		{
+			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);
+			}
+		}
+	}
+	user->WriteServ("323 %s :End of channel list.",user->nick);
 
+	return CMD_SUCCESS;
+}