X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=508956c44f166c051c10ac8749f10699569df717;hb=b57568ecc46296ba3a0e06d770eceff40cc9aee4;hp=b83cda6e91de8d956cfa7c457cf74b34449d8eba;hpb=fe6158e2374d6de2a6928133ad7c5b76dc71731d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index b83cda6e9..508956c44 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -16,17 +16,10 @@
 
 #include "configreader.h"
 #include "users.h"
-#include "message.h"
 #include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
+#include "wildcard.h"
 #include "commands/cmd_who.h"
 
-extern ServerConfig* Config;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-
 /* get the last 'visible' chan of a user */
 static char *getlastchanname(userrec *u)
 {
@@ -44,7 +37,65 @@ static char *getlastchanname(userrec *u)
 	return "*";
 }
 
-void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
+bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost, bool opt_mode)
+{
+	bool realhost = false;
+	bool realname = false;
+	bool positive = true;
+
+	if (user->registered != REG_ALL)
+		return false;
+
+	if (opt_mode)
+	{
+		for (const char* n = matchtext; *n; n++)
+		{
+			if (*n == '+')
+			{
+				positive = true;
+				continue;
+			}
+			else if (*n == '-')
+			{
+				positive = false;
+				continue;
+			}
+			if (user->IsModeSet(*n) != positive)
+				return false;
+		}
+		return true;
+	}
+
+	if (opt_realname)
+		realname = match(user->fullname, matchtext);
+
+	if (opt_showrealhost)
+		realhost = match(user->host, matchtext);
+
+	return ((realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
+}
+
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_who(Instance);
+}
+
+bool cmd_who::CanView(chanrec* chan, userrec* user)
+{
+	/* Execute items in fastest-to-execute first order */
+	if (*user->oper)
+		return true;
+	else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
+		return true;
+	else if (chan->HasUser(user))
+		return true;
+
+	return false;
+}
+
+CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	/*
 	 * XXX - RFC says:
@@ -53,12 +104,25 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 	 * Currently, we support WHO #chan, WHO nick, WHO 0, WHO *, and the addition of a 'o' flag, as per RFC.
 	 */
 
+	/* WHO options */
 	bool opt_viewopersonly = false;
+	bool opt_showrealhost = false;
+	bool opt_unlimit = false;
+	bool opt_realname = false;
+	bool opt_mode = false;
+
 	chanrec *ch = NULL;
 	std::vector<std::string> whoresults;
 	std::string initial = "352 " + std::string(user->nick) + " ";
 
-	if (pcnt == 2)
+	const char* matchtext = NULL;
+
+	/* Change '0' into '*' so the wildcard matcher can grok it */
+	matchtext = parameters[0];
+	if (!strcmp(matchtext,"0"))
+		matchtext = "*";
+
+	if (pcnt > 1)
 	{
 		/* parse flags */
 		const char *iter = parameters[1];
@@ -69,7 +133,21 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 			{
 				case 'o':
 					opt_viewopersonly = true;
-					break;
+				break;
+				case 'h':
+					if (*user->oper)
+						opt_showrealhost = true;
+				break;
+				case 'u':
+					if (*user->oper)
+						opt_unlimit = true;
+				break;
+				case 'r':
+					opt_realname = true;
+				break;
+				case 'm':
+					opt_mode = true;
+				break;
 			}
 
 			*iter++;
@@ -78,9 +156,9 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 
 
 	/* who on a channel? */
-	ch = FindChan(parameters[0]);
+	ch = ServerInstance->FindChan(matchtext);
 
-	if (ch)
+	if ((ch) && (CanView(ch,user)))
 	{
 		/* who on a channel. */
 		CUList *cu = ch->GetUsers();
@@ -91,11 +169,10 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 			if (opt_viewopersonly && !*(i->second)->oper)
 				continue;
 
-
 			/* XXX - code duplication; this could be more efficient -- w00t */
 			std::string wholine = initial;
 
-			wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + i->second->dhost + " " + 
+			wholine = wholine + ch->name + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
 					i->second->server + " " + i->second->nick + " ";
 
 			/* away? */
@@ -114,59 +191,32 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 				wholine.append("*");
 			}
 
-			wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname;
+			wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
 			whoresults.push_back(wholine);
 		}
 	}
 	else
 	{
-		/* uhggle. who on .. something else. */
-		userrec *u = Find(parameters[0]);
+		/* Match against wildcard of nick, server or host */
 
-		if (u)
+		if (opt_viewopersonly)
 		{
-			/* who on a single user */
-			std::string wholine = initial;
-
-			wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + i->second->dhost + " " + 
-					i->second->server + " " + i->second->nick + " ";
-
-			/* away? */
-			if (*(i->second)->awaymsg)
+			/* Showing only opers */
+			for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
 			{
-				wholine.append("G");
-			}
-			else
-			{
-				wholine.append("H");
-			}
-
-			/* oper? */
-			if (*(i->second)->oper)
-			{
-				wholine.append("*");
-			}
-
-			wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname;
-			whoresults.push_back(wholine);
-		}
-
-		is (*parameters[0] == '*' || *parameters[0] == '0')
-		{
-			if (!opt_viewopersonly && !*user->oper)
-				return; /* No way, jose */
+				userrec* oper = *i;
 
-			if (opt_viewopersonly)
-			{
-				for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+				if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode))
 				{
 					std::string wholine = initial;
+	
+					wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " + 
+							oper->server + " " + oper->nick + " ";
 
-					wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + i->second->dhost + " " + 
-							i->second->server + " " + i->second->nick + " ";
+					ch = ServerInstance->FindChan(getlastchanname(oper));
 
 					/* away? */
-					if (*(i->second)->awaymsg)
+					if (*oper->awaymsg)
 					{
 						wholine.append("G");
 					}
@@ -174,25 +224,30 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 					{
 						wholine.append("H");
 					}
-
+	
 					/* oper? */
-					if (*(i->second)->oper)
+					if (*oper->oper)
 					{
 						wholine.append("*");
 					}
-
-					wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname;
+	
+					wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
 					whoresults.push_back(wholine);
 				}
 			}
-			else
+		}
+		else
+		{
+			for (user_hash::iterator i = ServerInstance->clientlist.begin(); i != ServerInstance->clientlist.end(); i++)
 			{
-				for (std::vector<userrec*>::iterator i = clientlist.begin(); i != clientlist.end(); i++)
+				if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode))
 				{
 					std::string wholine = initial;
-
-					wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + i->second->dhost + " " + 
-							i->second->server + " " + i->second->nick + " ";
+	
+					wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
+						i->second->server + " " + i->second->nick + " ";
+	
+					ch = ServerInstance->FindChan(getlastchanname(i->second));
 
 					/* away? */
 					if (*(i->second)->awaymsg)
@@ -210,10 +265,24 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 						wholine.append("*");
 					}
 
-					wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname;
+					wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
 					whoresults.push_back(wholine);
 				}
 			}
 		}
 	}
+	/* Send the results out */
+	if ((whoresults.size() < (size_t)ServerInstance->Config->MaxWhoResults) && (!opt_unlimit))
+	{
+		for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
+			user->WriteServ(*n);
+		user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
+		return CMD_SUCCESS;
+	}
+	else
+	{
+		/* BZZT! Too many results. */
+		user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]);
+		return CMD_FAILURE;
+	}
 }