* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
+#include "inspircd.h"
#include "configreader.h"
#include "users.h"
#include "modules.h"
return "*";
}
-bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost, bool opt_mode)
+bool cmd_who::whomatch(userrec* user, const char* matchtext)
{
bool realhost = false;
bool realname = false;
bool positive = true;
+ bool metadata = false;
+ bool ident = false;
+ bool away = false;
+ bool port = false;
+ char* dummy = NULL;
if (user->registered != REG_ALL)
return false;
+ if (opt_local && !IS_LOCAL(user))
+ return false;
+ else if (opt_far && IS_LOCAL(user))
+ return false;
+
if (opt_mode)
{
for (const char* n = matchtext; *n; n++)
}
return true;
}
+ else
+ {
- 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)));
+ if (opt_metadata)
+ metadata = user->GetExt(matchtext, dummy);
+ else
+ {
+ if (opt_realname)
+ realname = match(user->fullname, matchtext);
+ else
+ {
+ if (opt_showrealhost)
+ realhost = match(user->host, matchtext);
+ else
+ {
+ if (opt_ident)
+ ident = match(user->ident, matchtext);
+ else
+ {
+ if (opt_port)
+ {
+ irc::portparser portrange(matchtext, false);
+ long portno = -1;
+ while ((portno = portrange.GetToken()))
+ if (portno == user->GetPort())
+ port = true;
+ }
+ else
+ {
+ if (opt_away)
+ away = match(user->awaymsg, matchtext);
+ }
+ }
+ }
+ }
+ }
+ return ((port) || (away) || (ident) || (metadata) || (realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
+ }
}
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
{
return new cmd_who(Instance);
}
return false;
/* Execute items in fastest-to-execute first order */
- if (*user->oper)
+
+ /* Opers see all */
+ if (IS_OPER(user))
return true;
else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
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);
+ chanrec* chlast = ServerInstance->FindChan(lcn);
+
+ /* Not visible to this user */
+ if (u->Visibility && !u->Visibility->VisibleTo(user))
+ return;
+
+ std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
+ ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
+ " " + u->nick + " ";
+
+ /* away? */
+ if (IS_AWAY(u))
+ {
+ wholine.append("G");
+ }
+ else
+ {
+ wholine.append("H");
+ }
+
+ /* oper? */
+ if (IS_OPER(u))
+ {
+ wholine.append("*");
+ }
+
+ wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname;
+ whoresults.push_back(wholine);
+}
+
CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
{
/*
*/
/* WHO options */
- bool opt_viewopersonly = false;
- bool opt_showrealhost = false;
- bool opt_unlimit = false;
- bool opt_realname = false;
- bool opt_mode = false;
+ opt_viewopersonly = false;
+ opt_showrealhost = false;
+ opt_unlimit = false;
+ opt_realname = false;
+ opt_mode = false;
+ opt_ident = false;
+ opt_metadata = false;
+ opt_port = false;
+ opt_away = false;
+ opt_local = false;
+ opt_far = false;
chanrec *ch = NULL;
std::vector<std::string> whoresults;
opt_viewopersonly = true;
break;
case 'h':
- if (*user->oper)
+ if (IS_OPER(user))
opt_showrealhost = true;
break;
case 'u':
- if (*user->oper)
+ if (IS_OPER(user))
opt_unlimit = true;
break;
case 'r':
case 'm':
opt_mode = true;
break;
+ case 'M':
+ opt_metadata = true;
+ break;
+ case 'i':
+ opt_ident = true;
+ break;
+ case 'p':
+ opt_port = true;
+ break;
+ case 'a':
+ opt_away = true;
+ break;
+ case 'l':
+ opt_local = true;
+ break;
+ case 'f':
+ opt_far = true;
+ break;
}
*iter++;
/* who on a channel? */
ch = ServerInstance->FindChan(matchtext);
- if ((ch) && (CanView(ch,user)))
+ if (ch)
{
- /* who on a channel. */
- CUList *cu = ch->GetUsers();
-
- for (CUList::iterator i = cu->begin(); i != cu->end(); i++)
+ if (CanView(ch,user))
{
- /* opers only, please */
- if (opt_viewopersonly && !*(i->second)->oper)
- continue;
-
- /* XXX - code duplication; this could be more efficient -- w00t */
- std::string wholine = initial;
-
- wholine = wholine + ch->name + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " +
- i->second->server + " " + i->second->nick + " ";
-
- /* away? */
- if (*(i->second)->awaymsg)
- {
- wholine.append("G");
- }
- else
- {
- wholine.append("H");
- }
-
- /* oper? */
- if (*(i->second)->oper)
+ bool inside = ch->HasUser(user);
+
+ /* who on a channel. */
+ CUList *cu = ch->GetUsers();
+
+ for (CUList::iterator i = cu->begin(); i != cu->end(); i++)
{
- wholine.append("*");
+ /* 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;
+
+ SendWhoLine(user, initial, ch, i->first, whoresults);
}
-
- wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
- whoresults.push_back(wholine);
}
}
else
{
userrec* oper = *i;
- if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode))
+ if (whomatch(oper, matchtext))
{
- std::string wholine = initial;
-
- wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " +
- oper->server + " " + oper->nick + " ";
+ if ((!oper->IsModeSet('i')) && (!IS_OPER(user)))
+ continue;
- ch = ServerInstance->FindChan(getlastchanname(oper));
-
- /* away? */
- if (*oper->awaymsg)
- {
- wholine.append("G");
- }
- else
- {
- wholine.append("H");
- }
-
- /* oper? */
- if (*oper->oper)
- {
- wholine.append("*");
- }
-
- wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
- whoresults.push_back(wholine);
+ SendWhoLine(user, initial, NULL, oper, whoresults);
}
}
}
{
for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
{
- if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode))
+ if (whomatch(i->second, matchtext))
{
- std::string wholine = initial;
-
- 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)
- {
- wholine.append("G");
- }
- else
- {
- wholine.append("H");
- }
-
- /* oper? */
- if (*(i->second)->oper)
- {
- wholine.append("*");
- }
+ if ((i->second->IsModeSet('i')) && (!IS_OPER(user)))
+ continue;
- wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
- whoresults.push_back(wholine);
+ SendWhoLine(user, initial, NULL, i->second, whoresults);
}
}
}
}
/* Send the results out */
- if ((whoresults.size() < (size_t)ServerInstance->Config->MaxWhoResults) && (!opt_unlimit))
+ 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);
projects / user / henk / code / inspircd.git / blobdiff