m_names fix (changed the wrong part all commits before -.-)

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

diff --git a/ircd/m_names.c b/ircd/m_names.c
index 13950fc22a32ce22468729a2997b4d28b474828e..0e1169e7016a38e300ece79c56871fe18c009971 100644 (file)
--- a/ircd/m_names.c
+++ b/ircd/m_names.c
@@ -252,10 +252,9 @@ int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
         if (!ShowChannel(sptr, ch2ptr))
           continue;                 /* Don't show secret chans. */ 
         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. */
+          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|((chptr->mode.mode & MODE_AUDITORIUM) ? NAMES_OPS : 0));
+          do_names(sptr, ch2ptr, showingdelayed|NAMES_VIS|((ch2ptr->mode.mode & MODE_AUDITORIUM) ? NAMES_OPS : 0));
       } 
 
       /* List all remaining users on channel '*' */
@@ -312,7 +311,7 @@ int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
          *  Special Case 2: User is on this channel, requesting full names list.
          *  (As performed with each /join) - ** High frequency usage **
          */
-        do_names(sptr, chptr, showingdelayed|NAMES_ALL|NAMES_EON);
+        do_names(sptr, chptr, showingdelayed|NAMES_ALL|NAMES_EON|((chptr->mode.mode & MODE_AUDITORIUM) && !(member->status & MODE_CHANOP) ? NAMES_OPS : 0));
       }
       else
       {
@@ -320,7 +319,7 @@ int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
          *  Special Case 3: User isn't on this channel, show all visible users, in 
          *  non secret channels.
          */ 
-        do_names(sptr, chptr, showingdelayed|NAMES_VIS|NAMES_EON);
+        do_names(sptr, chptr, showingdelayed|NAMES_VIS|NAMES_EON|((ch2ptr->mode.mode & MODE_AUDITORIUM) ? NAMES_OPS : 0));
       } 
     }
     else