don't allow users to change their nick if the new nick is banned in a channel the...

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

diff --git a/ircd/m_join.c b/ircd/m_join.c
index 3bc64b6e3fce267b742a116377ebd2671630267b..db04f6788ebf16ca4cfd6a954517ddb94ec7d21a 100644 (file)
--- a/ircd/m_join.c
+++ b/ircd/m_join.c
@@ -157,7 +157,9 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       send_reply(sptr, ERR_TOOMANYCHANNELS, name);
       break; /* no point processing the other channels */
     }
-
+    
+       int flags = 0;
+       
     /* BADCHANed channel */
     if ((gline = gline_find(name, GLINE_BADCHAN)) &&
        GlineIsActive(gline) && !IsAnOper(sptr)) {
@@ -192,7 +194,7 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     } else if (check_target_limit(sptr, chptr, chptr->chname, 0)) {
       continue;
     } else {
-      int flags = CHFL_DEOPPED;
+      flags = CHFL_DEOPPED;
       int err = 0;
       int override = 0;
 
@@ -285,6 +287,8 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
                    do_names(sptr, chptrb, NAMES_ALL|NAMES_EON);
                  }
                } else {
+          if(find_member_link(chptrb, sptr))
+            continue; //we have already joined this channel
                  //first of all check if we may even join this channel
                  int err2 = 0;
                  if (chptrb->users == 0 && !chptrb->mode.apass[0] && !(chptrb->mode.mode & MODE_PERSIST)) {
@@ -310,7 +314,7 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
               send_reply(sptr, RPL_TOPIC, chptrb->chname, chptrb->topic);
               send_reply(sptr, RPL_TOPICWHOTIME, chptrb->chname, chptrb->topic_nick, chptrb->topic_time);
             }
-            do_names(sptr, chptrb, NAMES_ALL|NAMES_EON); /* send /names list */
+            do_names(sptr, chptrb, NAMES_ALL|NAMES_EON|(((chptrb->mode.mode & MODE_AUDITORIUM) && !(flags & CHFL_CHANOP)) ? NAMES_OPS : 0)); /* send /names list */
                  }
            }
          }