X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=blobdiff_plain;f=ircd%2Fm_names.c;h=13950fc22a32ce22468729a2997b4d28b474828e;hp=41a48c7f207cc00c69fc51304e65ae2fff98a3eb;hb=79a0619fa0428943d74c5004a6eb922a1c1f3c21;hpb=2408eeb1527f43b1214bd80eccd76e7fc9959432 diff --git a/ircd/m_names.c b/ircd/m_names.c index 41a48c7..13950fc 100644 --- a/ircd/m_names.c +++ b/ircd/m_names.c @@ -246,15 +246,16 @@ int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) mlen = strlen(cli_name(&me)) + 10 + strlen(cli_name(sptr)); /* List all visible channels/visible members */ - + struct Membership *member; for (ch2ptr = GlobalChannelList; ch2ptr; ch2ptr = ch2ptr->next) { if (!ShowChannel(sptr, ch2ptr)) continue; /* Don't show secret chans. */ - else if (find_channel_member(sptr, ch2ptr)) - do_names(sptr, ch2ptr, showingdelayed|NAMES_ALL); /* Full list if we're in this chan. */ - else - do_names(sptr, ch2ptr, showingdelayed|NAMES_VIS); + else if ((member = find_channel_member(sptr, ch2ptr))) { + + do_names(sptr, ch2ptr, showingdelayed|NAMES_ALL|((chptr->mode.mode & MODE_AUDITORIUM) && !(member->status & MODE_CHANOP) ? NAMES_OPS : 0)); /* Full list if we're in this chan. */ + } else + do_names(sptr, ch2ptr, showingdelayed|NAMES_VIS|((chptr->mode.mode & MODE_AUDITORIUM) ? NAMES_OPS : 0)); } /* List all remaining users on channel '*' */