X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=07370f31eddaa422f7dafc03f68cb8ce54bee1a3;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=31e8030f5d0fc470396fdaf95e8c098f8c7ea3a1;hpb=47a4c36063749a8dc52dbbd5caba5c4c6f7aaf1c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 31e8030f5..07370f31e 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -12,14 +12,10 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-/* get the last 'visible' chan of a user */
-static char *getlastchanname(userrec *u)
+static char *get_first_visible_channel(userrec *u)
 {
 	UCListIter i = u->chans.begin();
 	if (i != u->chans.end())
@@ -121,22 +117,24 @@ bool cmd_who::CanView(chanrec* chan, userrec* user)
 	if (!user || !chan)
 		return false;
 
-	/* Execute items in fastest-to-execute first order */
-
+	/* Bug #383 - moved higher up the list, because if we are in the channel
+	 * we can see all its users
+	 */
+	if (chan->HasUser(user))
+		return true;
 	/* Opers see all */
 	if (IS_OPER(user))
 		return true;
+	/* Cant see inside a +s or a +p channel unless we are a member (see above) */
 	else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
 		return true;
-	else if (chan->HasUser(user))
-		return true;
 
 	return false;
 }
 
 void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults)
 {
-	std::string lcn = getlastchanname(u);
+	std::string lcn = get_first_visible_channel(u);
 	chanrec* chlast = ServerInstance->FindChan(lcn);
 
 	/* Not visible to this user */
@@ -194,12 +192,22 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 	std::string initial = "352 " + std::string(user->nick) + " ";
 
 	const char* matchtext = NULL;
+	bool usingwildcards = false;
 
 	/* Change '0' into '*' so the wildcard matcher can grok it */
 	matchtext = parameters[0];
 	if (!strcmp(matchtext,"0"))
 		matchtext = "*";
 
+	for (const char* check = matchtext; *check; check++)
+	{
+		if (*check == '*' || *check == '?')
+		{
+			usingwildcards = true;
+			break;
+		}
+	}
+
 	if (pcnt > 1)
 	{
 		/* parse flags */
@@ -265,13 +273,17 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 	
 			for (CUList::iterator i = cu->begin(); i != cu->end(); i++)
 			{
-				/* opers only, please */
-				if (opt_viewopersonly && !IS_OPER(i->first))
-					continue;
+				/* None of this applies if we WHO ourselves */
+				if (user != i->first)
+				{
+					/* opers only, please */
+					if (opt_viewopersonly && !IS_OPER(i->first))
+						continue;
 	
-				/* If we're not inside the channel, hide +i users */
-				if (i->first->IsModeSet('i') && !inside)
-					continue;
+					/* If we're not inside the channel, hide +i users */
+					if (i->first->IsModeSet('i') && !inside)
+						continue;
+				}
 	
 				SendWhoLine(user, initial, ch, i->first, whoresults);
 			}
@@ -280,7 +292,6 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 	else
 	{
 		/* Match against wildcard of nick, server or host */
-
 		if (opt_viewopersonly)
 		{
 			/* Showing only opers */
@@ -290,8 +301,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 
 				if (whomatch(oper, matchtext))
 				{
-					if ((!oper->IsModeSet('i')) && (!IS_OPER(user)))
-						continue;
+					if (!user->SharesChannelWith(oper))
+					{
+						if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user)))
+							continue;
+					}
 
 					SendWhoLine(user, initial, NULL, oper, whoresults);
 				}
@@ -303,8 +317,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 			{
 				if (whomatch(i->second, matchtext))
 				{
-					if ((i->second->IsModeSet('i')) && (!IS_OPER(user)))
-						continue;
+					if (!user->SharesChannelWith(i->second))
+					{
+						if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user)))
+							continue;
+					}
 
 					SendWhoLine(user, initial, NULL, i->second, whoresults);
 				}
@@ -326,3 +343,4 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 		return CMD_FAILURE;
 	}
 }
+