send PART event for opped or voiced users to ALL users in the channel (fixed status...

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

diff --git a/ircd/channel.c b/ircd/channel.c
index f8f5239c59e7e4976eb929ce88646e7bfc85b418..aa266307b4dbbc5ad26739aabfb1b31eeb20b2da 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3497,7 +3497,7 @@ mode_process_clients(struct ParseState *state)
         SetOpLevel(member, OpLevel(state->member) + 1);
     }
        
-       ulong64 old_status = member->status;
+       int user_visible = (member->status & CHFL_VOICED_OR_OPPED);
        
     /* actually effect the change */
     if (state->flags & MODE_PARSE_SET) {
@@ -3520,9 +3520,9 @@ mode_process_clients(struct ParseState *state)
        
        if((member->channel->mode.mode & MODE_AUDITORIUM)) {
                //join or part the user
-               if((member->status & CHFL_VOICED_OR_OPPED) & !(old_status & CHFL_VOICED_OR_OPPED)) {
+               if((member->status & CHFL_VOICED_OR_OPPED) && !user_visible) {
                        sendcmdto_channel_butserv_butone(member->user, CMD_JOIN, member->channel, member->user, SKIP_OPS, ":%H", member->channel);
-               } else if(!(member->status & CHFL_VOICED_OR_OPPED) & (old_status & CHFL_VOICED_OR_OPPED)) {
+               } else if(!(member->status & CHFL_VOICED_OR_OPPED) && user_visible) {
                        sendcmdto_channel_butserv_butone(member->user, CMD_PART, member->channel, member->user, SKIP_OPS, "%H :%s", member->channel, "user deoped/devoiced on a +u channel.");
                }
                if(MyUser(member->user) && (state->cli_change[i].flag & MODE_CHANOP)) {
@@ -3916,8 +3916,11 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
     SetUserParting(member);
 
     /* Send notification to channel */
-       if((chan->mode.mode & MODE_AUDITORIUM) && !(flags & CHFL_VOICED_OR_OPPED)) {
-         //do noting here
+       if((chan->mode.mode & MODE_AUDITORIUM) && !(member->status & CHFL_VOICED_OR_OPPED)) {
+         //send part to ops only
+         sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL, SKIP_NONOPS, "%H :%s", chan, jbuf->jb_comment);
+         if(MyUser(jbuf->jb_source))
+                 sendcmdto_one(jbuf->jb_source, CMD_PART, jbuf->jb_source, "%H :%s", chan, jbuf->jb_comment);
     } else if (!(flags & (CHFL_ZOMBIE | CHFL_DELAYED)))
       sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL, 0,
                                (flags & CHFL_BANNED || !jbuf->jb_comment) ?