X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_list.cpp;h=40a5c8b59ddac9977dd35e17a74294a88baa0a7f;hb=87b1461e2a4710a38b32186c2582da9fe9bb3804;hp=600ec47c2e3b31772aaa92de9e2cdcf990577fdd;hpb=124c17e14134a4999afc1a5e981ab7c75b3694b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp
index 600ec47c2..40a5c8b59 100644
--- a/src/coremods/core_list.cpp
+++ b/src/coremods/core_list.cpp
@@ -48,6 +48,7 @@ class CommandList : public Command
 		, secretmode(creator, "secret")
 		, privatemode(creator, "private")
 	{
+		allow_empty_last_param = false;
 		Penalty = 5;
 	}
 
@@ -56,13 +57,13 @@ class CommandList : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 
 /** Handle /LIST
  */
-CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandList::Handle(User* user, const Params& parameters)
 {
 	// C: Searching based on creation time, via the "C<val" and "C>val" modifiers
 	// to search for a channel creation time that is lower or higher than val
@@ -87,36 +88,37 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 	size_t minusers = 0;
 	size_t maxusers = 0;
 
-	if ((parameters.size() == 1) && (!parameters[0].empty()))
+	for (Params::const_iterator iter = parameters.begin(); iter != parameters.end(); ++iter)
 	{
-		if (parameters[0][0] == '<')
+		const std::string& constraint = *iter;
+		if (constraint[0] == '<')
 		{
-			maxusers = ConvToNum<size_t>(parameters[0].c_str() + 1);
+			maxusers = ConvToNum<size_t>(constraint.c_str() + 1);
 		}
-		else if (parameters[0][0] == '>')
+		else if (constraint[0] == '>')
 		{
-			minusers = ConvToNum<size_t>(parameters[0].c_str() + 1);
+			minusers = ConvToNum<size_t>(constraint.c_str() + 1);
 		}
-		else if (!parameters[0].compare(0, 2, "C<", 2))
+		else if (!constraint.compare(0, 2, "C<", 2) || !constraint.compare(0, 2, "c<", 2))
 		{
-			mincreationtime = ParseMinutes(parameters[0]);
+			mincreationtime = ParseMinutes(constraint);
 		}
-		else if (!parameters[0].compare(0, 2, "C>", 2))
+		else if (!constraint.compare(0, 2, "C>", 2) || !constraint.compare(0, 2, "c>", 2))
 		{
-			maxcreationtime = ParseMinutes(parameters[0]);
+			maxcreationtime = ParseMinutes(constraint);
 		}
-		else if (!parameters[0].compare(0, 2, "T<", 2))
+		else if (!constraint.compare(0, 2, "T<", 2) || !constraint.compare(0, 2, "t<", 2))
 		{
-			mintopictime = ParseMinutes(parameters[0]);
+			mintopictime = ParseMinutes(constraint);
 		}
-		else if (!parameters[0].compare(0, 2, "T>", 2))
+		else if (!constraint.compare(0, 2, "T>", 2) || !constraint.compare(0, 2, "t>", 2))
 		{
-			maxtopictime = ParseMinutes(parameters[0]);
+			maxtopictime = ParseMinutes(constraint);
 		}
 		else
 		{
 			// If the glob is prefixed with ! it is inverted.
-			match = parameters[0].c_str();
+			match = constraint.c_str();
 			if (match[0] == '!')
 			{
 				match_inverted = true;