m_join forward nicklist restriction & m_names manual nicklist restriction

[ircu2.10.12-pk.git] / ircd / m_names.c

diff --git a/ircd/m_names.c b/ircd/m_names.c
index 16cee5cac1b624879891b32d2d57277bbeb33c44..13950fc22a32ce22468729a2997b4d28b474828e 100644 (file)
--- a/ircd/m_names.c
+++ b/ircd/m_names.c
@@ -106,6 +106,7 @@
  *  NAMES_DEL - Show join-delayed names list.
  *  NAMES_EON - When OR'd with the other two, adds an 'End of Names' numeric
  *              used by m_join
+ *  NAMES_OPS - Only list oped (+o) or voiced (+v) users
  *
  */
 
@@ -165,6 +166,9 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
                
        if (IsInvisibleJoin(member) && member->user != sptr)
                continue;
+       
+       if (!IsChanOp(member) && !HasVoice(member) && member->user != sptr && (filter & NAMES_OPS))
+               continue;
 
     if (needs_space)
       buf[idx++] = ' ';
@@ -242,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 '*' */