X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_who.cpp;h=aa19efe97db3f156ce432fa394750e3911c03818;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=132f8bc1e29d5d2af8396ab3310a3b0a7c3d011c;hpb=6adca3e0997781eae4adb02f19a2f8c312512ae1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index 132f8bc1e..aa19efe97 100644
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -1,10 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018 Peter Powell <petpow@saberuk.com>
- *   Copyright (C) 2014 Adam <Adam@anope.org>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 Adam <Adam@anope.org>
+ *   Copyright (C) 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2009 John Brooks <special@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -34,8 +40,36 @@ enum
 	RPL_WHOSPCRPL = 354
 };
 
+static const char whox_field_order[] = "tcuihsnfdlaor";
+static const char who_field_order[] = "cuhsnf";
+
 struct WhoData : public Who::Request
 {
+	bool GetFieldIndex(char flag, size_t& out) const CXX11_OVERRIDE
+	{
+		if (!whox)
+		{
+			const char* pos = strchr(who_field_order, flag);
+			if (pos == NULL)
+				return false;
+
+			out = pos - who_field_order;
+			return true;
+		}
+
+		if (!whox_fields[flag])
+			return false;
+
+		out = 0;
+		for (const char* c = whox_field_order; *c && *c != flag; ++c)
+		{
+			if (whox_fields[*c])
+				++out;
+		}
+
+		return whox_field_order[out];
+	}
+
 	WhoData(const CommandBase::Params& parameters)
 	{
 		// Find the matchtext and swap the 0 for a * so we can use InspIRCd::Match on it.
@@ -43,9 +77,6 @@ struct WhoData : public Who::Request
 		if (matchtext == "0")
 			matchtext = "*";
 
-		// Fuzzy matches are when the source has not specified a specific user.
-		fuzzy_match = (parameters.size() > 1) || (matchtext.find_first_of("*?.") != std::string::npos);
-
 		// If flags have been specified by the source.
 		if (parameters.size() > 1)
 		{
@@ -74,6 +105,9 @@ struct WhoData : public Who::Request
 				current_bitset->set(chr);
 			}
 		}
+
+		// Fuzzy matches are when the source has not specified a specific user.
+		fuzzy_match = flags.any() || (matchtext.find_first_of("*?.") != std::string::npos);
 	}
 };
 
@@ -143,7 +177,7 @@ class CommandWho : public SplitCommand
 		, whoevprov(parent, "event/who")
 	{
 		allow_empty_last_param = false;
-		syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [[Aafhilmnoprstux][%acdfhilnorstu] <server>|<nickname>|<channel>|<realname>|<host>|0]";
+		syntax = "<server>|<nick>|<channel>|<realname>|<host>|0 [[Aafhilmnoprstux][%acdfhilnorstu] <server>|<nick>|<channel>|<realname>|<host>|0]";
 	}
 
 	/** Sends a WHO reply to a user. */
@@ -274,7 +308,7 @@ bool CommandWho::MatchUser(LocalUser* source, User* user, WhoData& data)
 			long port;
 			while ((port = portrange.GetToken()))
 			{
-				if (port == lu->GetServerPort())
+				if (port == lu->server_sa.port())
 				{
 					match = true;
 					break;
@@ -357,13 +391,14 @@ void CommandWho::WhoChannel(LocalUser* source, const std::vector<std::string>& p
 template<typename T>
 void CommandWho::WhoUsers(LocalUser* source, const std::vector<std::string>& parameters, const T& users, WhoData& data)
 {
+	bool source_has_users_auspex = source->HasPrivPermission("users/auspex");
 	for (typename T::const_iterator iter = users.begin(); iter != users.end(); ++iter)
 	{
 		User* user = GetUser(iter);
 
 		// Only show users in response to a fuzzy WHO if we can see them normally.
 		bool can_see_normally = user == source || source->SharesChannelWith(user) || !user->IsModeSet(invisiblemode);
-		if (data.fuzzy_match && !can_see_normally && !source->HasPrivPermission("users/auspex"))
+		if (data.fuzzy_match && !can_see_normally && !source_has_users_auspex)
 			continue;
 
 		// Skip the user if it doesn't match the query.