- 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|((ch2ptr->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|((ch2ptr->mode.mode & MODE_AUDITORIUM) ? NAMES_OPS : 0));