* USA
*/
#include "stdinc.h"
-#include "common.h"
#include "client.h"
#include "channel.h"
#include "hash.h"
#define FIELD_ACCOUNT 0x0800
#define FIELD_OPLEVEL 0x1000 /* meaningless and stupid, but whatever */
+static const char who_desc[] =
+ "Provides the WHO command to display information for users on a channel";
+
struct who_format
{
int fields;
const char *querytype;
};
-static int m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static const char who_desc[] =
- "Provides the WHO command to display information for users on a channel";
+static void m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
+ int server_oper, int member,
+ struct who_format *fmt);
+static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt);
+static void do_who(struct Client *source_p,
+ struct Client *target_p, struct membership *msptr,
+ struct who_format *fmt);
struct Message who_msgtab = {
"WHO", 0, 0, 0, 0,
delete_isupport("WHOX");
}
-mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
-DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, who_desc);
-
-static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
- int server_oper, int member,
- struct who_format *fmt);
-
-static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt);
-
-static void do_who(struct Client *source_p,
- struct Client *target_p, struct membership *msptr,
- struct who_format *fmt);
+int doing_who_show_idle_hook;
+mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
+mapi_hlist_av1 who_hlist[] = {
+ { "doing_who_show_idle", &doing_who_show_idle_hook },
+ { NULL, NULL }
+};
+DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, who_hlist, NULL, NULL, NULL, who_desc);
/*
** m_who
** parv[1] = nickname mask list
** parv[2] = additional selection flag and format options
*/
-static int
+static void
m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
static time_t last_used = 0;
if((*(mask + 1) == '\0') && (*mask == '*'))
{
if(source_p->user == NULL)
- return 0;
+ return;
if((lp = source_p->user->channel.head) != NULL)
{
msptr = lp->data;
- do_who_on_channel(source_p, msptr->chptr, server_oper, YES, &fmt);
+ do_who_on_channel(source_p, msptr->chptr, server_oper, true, &fmt);
}
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, "*");
- return 0;
+ return;
}
if(IsOperSpy(source_p) && *mask == '!')
{
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, parv[1]);
- return 0;
+ return;
}
}
if(chptr != NULL)
{
- if (!IsOper(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50))
+ if (!IsOperGeneral(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50))
{
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "WHO");
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, "*");
- return 0;
+ return;
}
if(operspy)
report_operspy(source_p, "WHO", chptr->chname);
if(IsMember(source_p, chptr) || operspy)
- do_who_on_channel(source_p, chptr, server_oper, YES, &fmt);
+ do_who_on_channel(source_p, chptr, server_oper, true, &fmt);
else if(!SecretChannel(chptr))
- do_who_on_channel(source_p, chptr, server_oper, NO, &fmt);
+ do_who_on_channel(source_p, chptr, server_oper, false, &fmt);
}
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, parv[1] + operspy);
- return 0;
+ return;
}
/* '/who nick' */
if(((target_p = find_named_person(mask)) != NULL) &&
- (!server_oper || IsOper(target_p)))
+ (!server_oper || SeesOper(target_p, source_p)))
{
int isinvis = 0;
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, mask);
- return 0;
+ return;
}
if(!IsFloodDone(source_p))
flood_endgrace(source_p);
/* it has to be a global who at this point, limit it */
- if(!IsOper(source_p))
+ if(!IsOperGeneral(source_p))
{
if((last_used + ConfigFileEntry.pace_wait) > rb_current_time() || !ratelimit_client(source_p, 1))
{
me.name, source_p->name, "WHO");
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, "*");
- return 0;
+ return;
}
else
last_used = rb_current_time();
sendto_one(source_p, form_str(RPL_ENDOFWHO),
me.name, source_p->name, mask);
-
- return 0;
}
/* who_common_channel
if(!IsInvisible(target_p) || IsMarked(target_p))
continue;
- if(server_oper && !IsOper(target_p))
+ if(server_oper && !SeesOper(target_p, source_p))
continue;
SetMark(target_p);
if((mask == NULL) ||
match(mask, target_p->name) || match(mask, target_p->username) ||
match(mask, target_p->host) || match(mask, target_p->servptr->name) ||
- (IsOper(source_p) && match(mask, target_p->orighost)) ||
+ (IsOperGeneral(source_p) && match(mask, target_p->orighost)) ||
match(mask, target_p->info))
{
do_who(source_p, target_p, NULL, fmt);
who_common_channel(source_p, msptr->chptr, mask, server_oper, &maxmatches, fmt);
}
}
- else if (!ConfigFileEntry.operspy_dont_care_user_info)
- report_operspy(source_p, "WHO", mask);
+ else
+ {
+ maxmatches = INT_MAX;
+ if (!ConfigFileEntry.operspy_dont_care_user_info)
+ report_operspy(source_p, "WHO", mask);
+ }
/* second, list all matching visible clients and clear all marks
* on invisible clients
continue;
}
- if(server_oper && !IsOper(target_p))
+ if(server_oper && !SeesOper(target_p, source_p))
continue;
if(maxmatches > 0)
if(!mask ||
match(mask, target_p->name) || match(mask, target_p->username) ||
match(mask, target_p->host) || match(mask, target_p->servptr->name) ||
- (IsOper(source_p) && match(mask, target_p->orighost)) ||
+ (IsOperGeneral(source_p) && match(mask, target_p->orighost)) ||
match(mask, target_p->info))
{
do_who(source_p, target_p, NULL, fmt);
msptr = ptr->data;
target_p = msptr->client_p;
- if(server_oper && !IsOper(target_p))
+ if(server_oper && !SeesOper(target_p, source_p))
continue;
if(member || !IsInvisible(target_p))
const char *q;
sprintf(status, "%c%s%s",
- target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
+ target_p->user->away ? 'G' : 'H', SeesOper(target_p, source_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
if (fmt->fields == 0)
sendto_one(source_p, form_str(RPL_WHOREPLY), me.name,
source_p->name, msptr ? msptr->chptr->chname : "*",
target_p->username, target_p->host,
target_p->servptr->name, target_p->name, status,
- ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount,
+ ConfigServerHide.flatten_links && !IsOperGeneral(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount,
target_p->info);
else
{
if (fmt->fields & FIELD_FLAGS)
append_format(str, sizeof str, &pos, " %s", status);
if (fmt->fields & FIELD_HOP)
- append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount);
+ append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOperGeneral(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount);
if (fmt->fields & FIELD_IDLE)
- append_format(str, sizeof str, &pos, " %d", (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0));
+ {
+ /* fire the doing_who_show_idle hook to allow modules to tell us whether to show the idle time */
+ hook_data_client_approval hdata_showidle;
+
+ hdata_showidle.client = source_p;
+ hdata_showidle.target = target_p;
+ hdata_showidle.approved = WHOIS_IDLE_SHOW;
+
+ call_hook(doing_who_show_idle_hook, &hdata_showidle);
+
+ append_format(str, sizeof str, &pos, " %d",
+ hdata_showidle.approved ? (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0) : 0);
+ }
if (fmt->fields & FIELD_ACCOUNT)
{
/* display as in whois */
if (pos >= sizeof str)
{
- static int warned = 0;
+ static bool warned = false;
if (!warned)
sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
"WHOX overflow while sending information about %s to %s",
target_p->name, source_p->name);
- warned = 1;
+ warned = true;
}
sendto_one(source_p, "%s", str);
}
projects / solanum.git / blobdiff