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");
/* '/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;
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))
{
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);
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));
if (fmt->fields & FIELD_ACCOUNT)